Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
evolve
Commits
acc3253f0ebc
Commit
acc3253f
authored
Sep 04, 2018
by
Boris Feld
Browse files
pick: Add a test to check that pick pick the right content
parent
46cd437fd3d2
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/test-grab.t
View file @
acc3253f
...
...
@@ -335,3 +335,106 @@
$ hg phase -r .
13: secret
Checking that grab don't forget new files behind
$ hg glog
@ 13:1705aa17bfed added l
|
o
11
:
10427
de9e26e
add
b
|
o
10
:
c437988de89f
foo
to
b
|
o
8
:
44e155
eb95c7
add
c
|
o
7
:
2
ccc03d1d096
foo
to
c
|
o
4
:
d46dc301d92f
add
y
|
o 3:8e224524cd09 add x
|
o 0:1f0dee641bb7 add a
$ hg up 10427de9e26e
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit comment
created new head
$ hg glog
@ 14:d6b8004e6bba add comment
|
|
o
13
:
1705
aa17bfed
added
l
|/
o
11
:
10427
de9e26e
add
b
|
o
10
:
c437988de89f
foo
to
b
|
o
8
:
44e155
eb95c7
add
c
|
o
7
:
2
ccc03d1d096
foo
to
c
|
o
4
:
d46dc301d92f
add
y
|
o 3:8e224524cd09 add x
|
o 0:1f0dee641bb7 add a
$ hg export .
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID d6b8004e6bbac8f43d0954c5deb0ccdc8df04dd5
# Parent 10427de9e26e48d0a0940780a0b62f5a6bd23117
add comment
diff -r 10427de9e26e -r d6b8004e6bba comment
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/comment Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+comment
$ hg up 1705aa17bfed
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg pick d6b8004e6bba
picking 14:d6b8004e6bba "add comment"
$ hg export .
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID fb65b6b1afa49130ea3b0d376b730faa08b2123b
# Parent 1705aa17bfed915e19659e41d416c354695cf8b1
add comment
diff -r 1705aa17bfed -r fb65b6b1afa4 comment
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/comment Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+comment
$ hg glog
@ 15:fb65b6b1afa4 add comment
|
o
13
:
1705
aa17bfed
added
l
|
o
11
:
10427
de9e26e
add
b
|
o
10
:
c437988de89f
foo
to
b
|
o
8
:
44e155
eb95c7
add
c
|
o
7
:
2
ccc03d1d096
foo
to
c
|
o
4
:
d46dc301d92f
add
y
|
o
3
:
8e224524
cd09
add
x
|
o
0
:
1
f0dee641bb7
add
a
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment