Show More
@@ -17,6 +17,7 b'' | |||
|
17 | 17 | $ hg copy foo baz |
|
18 | 18 | $ hg ci -m 'make bar and baz copies of foo' -d '2 0' |
|
19 | 19 | created new head |
|
20 | $ hg bookmark premerge1 | |
|
20 | 21 | $ hg merge |
|
21 | 22 | merging baz and foo to baz |
|
22 | 23 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
@@ -24,6 +25,7 b'' | |||
|
24 | 25 | $ hg ci -m 'merge local copy' -d '3 0' |
|
25 | 26 | $ hg up -C 1 |
|
26 | 27 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
28 | $ hg bookmark premerge2 | |
|
27 | 29 | $ hg merge 2 |
|
28 | 30 | merging foo and baz to baz |
|
29 | 31 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
@@ -50,12 +52,16 b'' | |||
|
50 | 52 | 2 mark baz executable |
|
51 | 53 | 1 branch foo |
|
52 | 54 | 0 close |
|
55 | updating bookmarks | |
|
53 | 56 | $ cd new |
|
54 | 57 | $ hg out ../orig |
|
55 | 58 | comparing with ../orig |
|
56 | 59 | searching for changes |
|
57 | 60 | no changes found |
|
58 | 61 | [1] |
|
62 | $ hg bookmarks | |
|
63 | premerge1 3:973ef48a98a4 | |
|
64 | premerge2 7:0d18d1112f1d | |
|
59 | 65 | $ cd .. |
|
60 | 66 | |
|
61 | 67 | check shamap LF and CRLF handling |
@@ -82,6 +88,7 b' check shamap LF and CRLF handling' | |||
|
82 | 88 | converting... |
|
83 | 89 | 1 change foo again again |
|
84 | 90 | 0 change foo again |
|
91 | updating bookmarks | |
|
85 | 92 | |
|
86 | 93 | init broken repository |
|
87 | 94 |
General Comments 0
You need to be logged in to leave comments.
Login now