Show More
@@ -0,0 +1,20 b'' | |||
|
1 | hg init test | |
|
2 | cd test | |
|
3 | echo foo > a | |
|
4 | hg ci -Ama | |
|
5 | ||
|
6 | hg up -r0000 | |
|
7 | echo bar > a | |
|
8 | echo % should issue warning | |
|
9 | hg ci -Amb | |
|
10 | ||
|
11 | hg up -r0000 | |
|
12 | echo stuffy > a | |
|
13 | echo % should not issue warning | |
|
14 | hg ci -q -Amc | |
|
15 | ||
|
16 | hg up -r0000 | |
|
17 | echo crap > a | |
|
18 | hg branch testing | |
|
19 | echo % should not issue warning | |
|
20 | hg ci -q -Amd |
@@ -0,0 +1,10 b'' | |||
|
1 | adding a | |
|
2 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
3 | % should issue warning | |
|
4 | adding a | |
|
5 | created new head | |
|
6 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
7 | % should not issue warning | |
|
8 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
9 | marked working directory as branch testing | |
|
10 | % should not issue warning |
@@ -547,7 +547,11 b' def commit(ui, repo, *pats, **opts):' | |||
|
547 | 547 | def commitfunc(ui, repo, files, message, match, opts): |
|
548 | 548 | return repo.commit(files, message, opts['user'], opts['date'], match, |
|
549 | 549 | force_editor=opts.get('force_editor')) |
|
550 | ||
|
551 | heads = repo.changelog.heads() | |
|
550 | 552 | cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
553 | if len(repo.changelog.heads()) > len(heads): | |
|
554 | ui.status(_('created new head\n')) | |
|
551 | 555 | |
|
552 | 556 | def copy(ui, repo, *pats, **opts): |
|
553 | 557 | """mark files as copied for the next commit |
@@ -13,6 +13,7 b' A b' | |||
|
13 | 13 | % should fail |
|
14 | 14 | a already tracked! |
|
15 | 15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | created new head | |
|
16 | 17 | merging a |
|
17 | 18 | warning: conflicts during merge. |
|
18 | 19 | merging a failed! |
@@ -46,6 +46,7 b' 3 b:4: b4' | |||
|
46 | 46 | 3 b:5: b5 |
|
47 | 47 | 3 b:6: b6 |
|
48 | 48 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 | created new head | |
|
49 | 50 | merging b |
|
50 | 51 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
51 | 52 | (branch merge, don't forget to commit) |
@@ -64,6 +65,7 b' 3 b:4: b4' | |||
|
64 | 65 | 4 b:5: c |
|
65 | 66 | 3 b:5: b5 |
|
66 | 67 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
68 | created new head | |
|
67 | 69 | merging b |
|
68 | 70 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
69 | 71 | (branch merge, don't forget to commit) |
@@ -21,10 +21,12 b' adding b' | |||
|
21 | 21 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
22 | 22 | abort: cannot back out change on a different branch |
|
23 | 23 | adding c |
|
24 | created new head | |
|
24 | 25 | abort: cannot back out change on a different branch |
|
25 | 26 | # backout with merge |
|
26 | 27 | adding a |
|
27 | 28 | reverting a |
|
29 | created new head | |
|
28 | 30 | changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182 |
|
29 | 31 | merging with changeset 3:26b8ccb9ad91 |
|
30 | 32 | merging a |
@@ -37,6 +39,7 b' line 3' | |||
|
37 | 39 | adding a |
|
38 | 40 | adding b |
|
39 | 41 | reverting a |
|
42 | created new head | |
|
40 | 43 | changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5 |
|
41 | 44 | the backout changeset is a new head - do not forget to merge |
|
42 | 45 | (use "backout --merge" if you want to auto-merge) |
@@ -47,6 +50,7 b' adding b' | |||
|
47 | 50 | adding c |
|
48 | 51 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
49 | 52 | adding d |
|
53 | created new head | |
|
50 | 54 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
51 | 55 | (branch merge, don't forget to commit) |
|
52 | 56 | # backout of merge should fail |
@@ -69,6 +73,7 b' adding file1' | |||
|
69 | 73 | marked working directory as branch branch2 |
|
70 | 74 | adding file2 |
|
71 | 75 | removing file1 |
|
76 | created new head | |
|
72 | 77 | changeset 3:f1c642b1d8e5 backs out changeset 1:bf1602f437f3 |
|
73 | 78 | the backout changeset is a new head - do not forget to merge |
|
74 | 79 | (use "backout --merge" if you want to auto-merge) |
@@ -9,6 +9,7 b' 1: Adding a branch' | |||
|
9 | 9 | ======= |
|
10 | 10 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
11 | 11 | marked working directory as branch b |
|
12 | created new head | |
|
12 | 13 | 2: Adding b branch |
|
13 | 14 | 1: Adding a branch |
|
14 | 15 | ------- |
@@ -20,6 +21,7 b' 1: Adding a branch' | |||
|
20 | 21 | 3: Adding b branch head 1 |
|
21 | 22 | ======= |
|
22 | 23 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
24 | created new head | |
|
23 | 25 | 4: Adding b branch head 2 |
|
24 | 26 | 3: Adding b branch head 1 |
|
25 | 27 | 1: Adding a branch |
@@ -28,6 +30,7 b' 4: Adding b branch head 2' | |||
|
28 | 30 | 3: Adding b branch head 1 |
|
29 | 31 | ======= |
|
30 | 32 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
33 | created new head | |
|
31 | 34 | 5: Adding b branch head 3 |
|
32 | 35 | 4: Adding b branch head 2 |
|
33 | 36 | 3: Adding b branch head 1 |
@@ -1,7 +1,9 b'' | |||
|
1 | 1 | marked working directory as branch a |
|
2 | 2 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
3 | 3 | marked working directory as branch b |
|
4 | created new head | |
|
4 | 5 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
6 | created new head | |
|
5 | 7 | marked working directory as branch c |
|
6 | 8 | c 5:5ca481e59b8c |
|
7 | 9 | a 1:dd6b440dd85a |
@@ -1,4 +1,5 b'' | |||
|
1 | 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3 | 4 | rev offset length base linkrev nodeid p1 p2 |
|
4 | 5 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
@@ -1,5 +1,6 b'' | |||
|
1 | 1 | ====== Setting up test |
|
2 | 2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | created new head | |
|
3 | 4 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
4 | 5 | checking changesets |
|
5 | 6 | checking manifests |
@@ -2,6 +2,7 b'' | |||
|
2 | 2 | bar |
|
3 | 3 | foo |
|
4 | 4 | |
|
5 | created new head | |
|
5 | 6 | % manifest of p1: |
|
6 | 7 | foo |
|
7 | 8 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -1,4 +1,5 b'' | |||
|
1 | 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3 | 4 | rev offset length base linkrev nodeid p1 p2 |
|
4 | 5 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
@@ -1,4 +1,6 b'' | |||
|
1 | created new head | |
|
1 | 2 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
3 | created new head | |
|
2 | 4 | # default style is like normal output |
|
3 | 5 | # normal |
|
4 | 6 | # verbose |
@@ -1,4 +1,5 b'' | |||
|
1 | 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | merging a |
|
3 | 4 | warning: conflicts during merge. |
|
4 | 5 | merging a failed! |
@@ -8,6 +8,7 b' forgetting b' | |||
|
8 | 8 | ? b |
|
9 | 9 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 10 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | created new head | |
|
11 | 12 | merging a |
|
12 | 13 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
13 | 14 | (branch merge, don't forget to commit) |
@@ -3,6 +3,7 b' marked working directory as branch branc' | |||
|
3 | 3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 4 | marked working directory as branch branchb |
|
5 | 5 | adding b |
|
6 | created new head | |
|
6 | 7 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
7 | 8 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 9 | % convert with datesort |
@@ -1,3 +1,5 b'' | |||
|
1 | created new head | |
|
2 | created new head | |
|
1 | 3 | @ 8 "8: change foo" files: foo |
|
2 | 4 | | |
|
3 | 5 | o 7 "7: second merge; change bar" files: bar baz |
@@ -1,3 +1,4 b'' | |||
|
1 | created new head | |
|
1 | 2 | merging baz and foo |
|
2 | 3 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
3 | 4 | (branch merge, don't forget to commit) |
@@ -5,6 +6,7 b' 1 files updated, 0 files merged, 1 files' | |||
|
5 | 6 | merging foo and baz |
|
6 | 7 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
7 | 8 | (branch merge, don't forget to commit) |
|
9 | created new head | |
|
8 | 10 | initializing destination new repository |
|
9 | 11 | scanning source... |
|
10 | 12 | sorting... |
@@ -258,6 +258,7 b' adding left-1' | |||
|
258 | 258 | adding left-2 |
|
259 | 259 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
260 | 260 | adding right-1 |
|
261 | created new head | |
|
261 | 262 | adding right-2 |
|
262 | 263 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
263 | 264 | merging b |
@@ -1,3 +1,4 b'' | |||
|
1 | created new head | |
|
1 | 2 | resolving manifests |
|
2 | 3 | overwrite None partial False |
|
3 | 4 | ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 |
@@ -1,4 +1,5 b'' | |||
|
1 | 1 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | changeset: 2:62ec0e86d1e5 |
|
3 | 4 | tag: tip |
|
4 | 5 | parent: 0:567dde5e6e98 |
@@ -4,11 +4,13 b' adding y' | |||
|
4 | 4 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
5 | 5 | adding x |
|
6 | 6 | adding y |
|
7 | created new head | |
|
7 | 8 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 9 | (branch merge, don't forget to commit) |
|
9 | 10 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 11 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
11 | 12 | (branch merge, don't forget to commit) |
|
13 | created new head | |
|
12 | 14 | requesting all changes |
|
13 | 15 | adding changesets |
|
14 | 16 | adding manifests |
@@ -1,9 +1,11 b'' | |||
|
1 | 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 4 | (branch merge, don't forget to commit) |
|
4 | 5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 7 | (branch merge, don't forget to commit) |
|
8 | created new head | |
|
7 | 9 | changeset: 4:f6c172c6198c |
|
8 | 10 | tag: tip |
|
9 | 11 | parent: 1:448a8c5e42f1 |
@@ -26,6 +26,7 b' options:' | |||
|
26 | 26 | use "hg -v help falabala" to show global options |
|
27 | 27 | diffing a.8a5febb7f867/a a.34eed99112ab/a |
|
28 | 28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | created new head | |
|
29 | 30 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
30 | 31 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
31 | 32 | (branch merge, don't forget to commit) |
@@ -1,6 +1,11 b'' | |||
|
1 | 1 | % init |
|
2 | 2 | % empty repo |
|
3 | 3 | % building tree |
|
4 | created new head | |
|
5 | created new head | |
|
6 | created new head | |
|
7 | created new head | |
|
8 | created new head | |
|
4 | 9 | % glog -q |
|
5 | 10 | @ 34:0eed7cd895e0 |
|
6 | 11 | | |
@@ -15,6 +15,7 b' pretxncommit hook: HG_NODE=1324a5531bac0' | |||
|
15 | 15 | 2:1324a5531bac |
|
16 | 16 | commit hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
17 | 17 | commit.b hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b |
|
18 | created new head | |
|
18 | 19 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
19 | 20 | (branch merge, don't forget to commit) |
|
20 | 21 | precommit hook: HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2 |
@@ -1,5 +1,6 b'' | |||
|
1 | 1 | # creating 'remote' |
|
2 | 2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | created new head | |
|
3 | 4 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
4 | 5 | rev offset length base linkrev nodeid p1 p2 |
|
5 | 6 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | adding bar |
|
2 | 2 | adding foo |
|
3 | 3 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
4 | created new head | |
|
4 | 5 | % start imerge |
|
5 | 6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 7 | (branch merge, don't forget to commit) |
@@ -174,6 +174,7 b' user: someoneelse' | |||
|
174 | 174 | % test fuzziness |
|
175 | 175 | adding a |
|
176 | 176 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
177 | created new head | |
|
177 | 178 | applying tip.patch |
|
178 | 179 | patching file a |
|
179 | 180 | Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines). |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | adding src/a.c |
|
2 | 2 | moving src/a.c to source/a.c |
|
3 | 3 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
4 | created new head | |
|
4 | 5 | ? src/a.o |
|
5 | 6 | merging src/a.c and source/a.c |
|
6 | 7 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | adding 1 |
|
2 | 2 | adding 2 |
|
3 | 3 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
4 | created new head | |
|
4 | 5 | resolving manifests |
|
5 | 6 | overwrite None partial False |
|
6 | 7 | ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c |
@@ -17,6 +18,7 b' getting 1a' | |||
|
17 | 18 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
18 | 19 | (branch merge, don't forget to commit) |
|
19 | 20 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
21 | created new head | |
|
20 | 22 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
21 | 23 | resolving manifests |
|
22 | 24 | overwrite None partial False |
@@ -85,6 +85,7 b' 0' | |||
|
85 | 85 | % log copies, non-linear manifest |
|
86 | 86 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
87 | 87 | adding foo |
|
88 | created new head | |
|
88 | 89 | 5 e (dir/b) |
|
89 | 90 | % log copies, execute bit set |
|
90 | 91 | 6 |
@@ -106,6 +107,7 b' diff -r 21fba396af4c -r 16b60bf3f99a d' | |||
|
106 | 107 | adding base |
|
107 | 108 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
108 | 109 | adding b1 |
|
110 | created new head | |
|
109 | 111 | % log -f |
|
110 | 112 | changeset: 3:e62f78d544b4 |
|
111 | 113 | tag: tip |
@@ -126,6 +128,7 b' summary: base' | |||
|
126 | 128 | |
|
127 | 129 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
128 | 130 | adding b2 |
|
131 | created new head | |
|
129 | 132 | % log -f -r 1:tip |
|
130 | 133 | changeset: 1:3d5bf5654eda |
|
131 | 134 | user: test |
@@ -1,4 +1,5 b'' | |||
|
1 | 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | merging bar and foo |
|
3 | 4 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
4 | 5 | (branch merge, don't forget to commit) |
@@ -14,6 +15,7 b' bar renamed from foo:9e25c27b87571a1edee' | |||
|
14 | 15 | 0 0 7 0 0 690b295714ae 000000000000 000000000000 |
|
15 | 16 | 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 |
|
16 | 17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18 | created new head | |
|
17 | 19 | 4:2d2f9a22c82b 2:0a3ab4856510 |
|
18 | 20 | 3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d |
|
19 | 21 | 2:0a3ab4856510 0:2665aaee66e9 |
@@ -62,6 +64,7 b' bar renamed from foo:9e25c27b87571a1edee' | |||
|
62 | 64 | 0 0 7 0 0 690b295714ae 000000000000 000000000000 |
|
63 | 65 | 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 |
|
64 | 66 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67 | created new head | |
|
65 | 68 | 4:2d2f9a22c82b 2:0a3ab4856510 |
|
66 | 69 | 3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 |
|
67 | 70 | 2:0a3ab4856510 0:2665aaee66e9 |
@@ -1,6 +1,8 b'' | |||
|
1 | 1 | adding a |
|
2 | 2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | created new head | |
|
3 | 4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | created new head | |
|
4 | 6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 7 | % should fail because not at a head |
|
6 | 8 | abort: repo has 3 heads - please merge with an explicit rev |
@@ -1,3 +1,4 b'' | |||
|
1 | created new head | |
|
1 | 2 | % local deleted a file, remote removed |
|
2 | 3 | abort: outstanding uncommitted changes |
|
3 | 4 | resolving manifests |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | adding file1 |
|
2 | 2 | adding file2 |
|
3 | 3 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | created new head | |
|
4 | 5 | |
|
5 | 6 | # non-interactive merge |
|
6 | 7 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -1,3 +1,4 b'' | |||
|
1 | created new head | |
|
1 | 2 | merging foo1 and foo |
|
2 | 3 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
3 | 4 | (branch merge, don't forget to commit) |
@@ -1,5 +1,6 b'' | |||
|
1 | 1 | adding a |
|
2 | 2 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | created new head | |
|
3 | 4 | resolving manifests |
|
4 | 5 | overwrite None partial False |
|
5 | 6 | ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c |
@@ -1,4 +1,5 b'' | |||
|
1 | 1 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | %% no merges expected |
|
3 | 4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
4 | 5 | (branch merge, don't forget to commit) |
@@ -9,6 +10,7 b' diff -r d9e5953b9dec b' | |||
|
9 | 10 | +This is file b1 |
|
10 | 11 | M b |
|
11 | 12 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
13 | created new head | |
|
12 | 14 | %% merge should fail |
|
13 | 15 | abort: untracked file in working directory differs from file in requested revision: 'b' |
|
14 | 16 | %% merge of b expected |
@@ -24,6 +26,7 b' diff -r d9e5953b9dec b' | |||
|
24 | 26 | M b |
|
25 | 27 | %% |
|
26 | 28 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 | created new head | |
|
27 | 30 | Contents of b should be "this is file b1" |
|
28 | 31 | This is file b1 |
|
29 | 32 | %% merge fails |
@@ -39,6 +42,7 b' diff -r c1dd73cbf59f b' | |||
|
39 | 42 | +This is file b22 |
|
40 | 43 | M b |
|
41 | 44 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
45 | created new head | |
|
42 | 46 | %% merge of b should fail |
|
43 | 47 | abort: outstanding uncommitted changes |
|
44 | 48 | %% merge of b expected |
@@ -1,5 +1,8 b'' | |||
|
1 | 1 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 4 | adding b |
|
5 | created new head | |
|
4 | 6 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 7 | adding b |
|
8 | created new head |
@@ -1,3 +1,4 b'' | |||
|
1 | 1 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | 4 | (branch merge, don't forget to commit) |
@@ -1,3 +1,4 b'' | |||
|
1 | 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | 2 | removing b |
|
3 | created new head | |
|
3 | 4 | abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |
@@ -2,6 +2,7 b' adding bar' | |||
|
2 | 2 | adding foo |
|
3 | 3 | adding quux1 |
|
4 | 4 | adding quux2 |
|
5 | created new head | |
|
5 | 6 | merging bar |
|
6 | 7 | merging bar failed! |
|
7 | 8 | merging foo and baz |
@@ -3,6 +3,7 b' adding b' | |||
|
3 | 3 | copy .hg/patches to .hg/patches.1 |
|
4 | 4 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 | 5 | M b |
|
6 | created new head | |
|
6 | 7 | a |
|
7 | 8 | b |
|
8 | 9 | merging with queue at: .hg/patches.1 |
@@ -323,6 +323,7 b' diff --git a/new b/copy' | |||
|
323 | 323 | copy from new |
|
324 | 324 | copy to copy |
|
325 | 325 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
326 | created new head | |
|
326 | 327 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
327 | 328 | adding branch |
|
328 | 329 | adding changesets |
@@ -401,6 +402,7 b' Now at: addbucephalus' | |||
|
401 | 402 | 8ba2a2f3e77b55d03051ff9c24ad65e7 bucephalus |
|
402 | 403 | % strip again |
|
403 | 404 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
405 | created new head | |
|
404 | 406 | merging foo |
|
405 | 407 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
406 | 408 | (branch merge, don't forget to commit) |
@@ -1,3 +1,4 b'' | |||
|
1 | created new head | |
|
1 | 2 | ** rename in working dir ** |
|
2 | 3 | ** add a a1 / add a a2 / hg mv a b |
|
3 | 4 | - working to parent: |
@@ -96,6 +97,7 b' diff --git a/a b/a' | |||
|
96 | 97 | +m2 |
|
97 | 98 | |
|
98 | 99 | |
|
100 | created new head | |
|
99 | 101 | ** copy in working dir ** |
|
100 | 102 | ** add a a1 / add a a2 / hg cp a b |
|
101 | 103 | - working to parent: |
@@ -211,6 +213,7 b' diff --git a/a b/a' | |||
|
211 | 213 | +m2 |
|
212 | 214 | |
|
213 | 215 | |
|
216 | created new head | |
|
214 | 217 | ** single rename ** |
|
215 | 218 | ** hg mv a b / add b b1 / add b w |
|
216 | 219 | - working to parent: |
@@ -324,6 +327,7 b' rename to a' | |||
|
324 | 327 | +m2 |
|
325 | 328 | |
|
326 | 329 | |
|
330 | created new head | |
|
327 | 331 | ** single copy ** |
|
328 | 332 | ** hg cp a b / add b b1 / add a w |
|
329 | 333 | - working to parent: |
@@ -472,6 +476,7 b' deleted file mode 100644' | |||
|
472 | 476 | -b1 |
|
473 | 477 | |
|
474 | 478 | |
|
479 | created new head | |
|
475 | 480 | ** rename chain ** |
|
476 | 481 | ** hg mv a b / hg mv b c / hg mv c d |
|
477 | 482 | - working to parent: |
@@ -574,6 +579,7 b' rename to a' | |||
|
574 | 579 | +m2 |
|
575 | 580 | |
|
576 | 581 | |
|
582 | created new head | |
|
577 | 583 | ** copy chain ** |
|
578 | 584 | ** hg cp a b / hg cp b c / hg cp c d |
|
579 | 585 | - working to parent: |
@@ -793,6 +799,7 b' deleted file mode 100644' | |||
|
793 | 799 | -5 |
|
794 | 800 | |
|
795 | 801 | |
|
802 | created new head | |
|
796 | 803 | ** circular rename ** |
|
797 | 804 | ** add a a1 / hg mv a b / hg mv b a |
|
798 | 805 | - working to parent: |
@@ -6,6 +6,7 b' abort: a branch of the same name already' | |||
|
6 | 6 | marked working directory as branch default |
|
7 | 7 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 8 | foo |
|
9 | created new head | |
|
9 | 10 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 11 | (branch merge, don't forget to commit) |
|
11 | 12 | foo |
@@ -4,6 +4,7 b' adding b' | |||
|
4 | 4 | adding c |
|
5 | 5 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
6 | 6 | adding c |
|
7 | created new head | |
|
7 | 8 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
8 | 9 | % hg parents |
|
9 | 10 | changeset: 3:02d851b7e549 |
@@ -1,4 +1,5 b'' | |||
|
1 | 1 | reverting a |
|
2 | created new head | |
|
2 | 3 | changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 |
|
3 | 4 | merging with changeset 3:107ce1ee2b43 |
|
4 | 5 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -1,4 +1,5 b'' | |||
|
1 | 1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2 | created new head | |
|
2 | 3 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3 | 4 | rev offset length base linkrev nodeid p1 p2 |
|
4 | 5 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
@@ -25,7 +25,9 b' added 2 changesets with 1 changes to 1 f' | |||
|
25 | 25 | adding foo |
|
26 | 26 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
27 | 27 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 | created new head | |
|
28 | 29 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
30 | created new head | |
|
29 | 31 | merging foo |
|
30 | 32 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
31 | 33 | (branch merge, don't forget to commit) |
@@ -4,6 +4,7 b' 0 files updated, 0 files merged, 0 files' | |||
|
4 | 4 | moving a/a to b/a |
|
5 | 5 | moving a/b to b/b |
|
6 | 6 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
7 | created new head | |
|
7 | 8 | resolving manifests |
|
8 | 9 | overwrite None partial False |
|
9 | 10 | ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 |
@@ -70,4 +71,5 b' a/* b/a b/b b/c b/d' | |||
|
70 | 71 | A b/c |
|
71 | 72 | a/c |
|
72 | 73 | ? b/d |
|
74 | created new head | |
|
73 | 75 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
@@ -1,5 +1,6 b'' | |||
|
1 | 1 | checkout |
|
2 | 2 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
3 | created new head | |
|
3 | 4 | merge |
|
4 | 5 | resolving manifests |
|
5 | 6 | overwrite None partial False |
@@ -1,3 +1,4 b'' | |||
|
1 | created new head | |
|
1 | 2 | -------------- |
|
2 | 3 | test L:up a R:nc a b W: - 1 get local a to b |
|
3 | 4 | -------------- |
@@ -28,6 +29,7 b' M b' | |||
|
28 | 29 | C a |
|
29 | 30 | -------------- |
|
30 | 31 | |
|
32 | created new head | |
|
31 | 33 | -------------- |
|
32 | 34 | test L:nc a b R:up a W: - 2 get rem change to a and b |
|
33 | 35 | -------------- |
@@ -59,6 +61,7 b' M b' | |||
|
59 | 61 | a |
|
60 | 62 | -------------- |
|
61 | 63 | |
|
64 | created new head | |
|
62 | 65 | -------------- |
|
63 | 66 | test L:up a R:nm a b W: - 3 get local a change to b, remove a |
|
64 | 67 | -------------- |
@@ -89,6 +92,7 b' M b' | |||
|
89 | 92 | a |
|
90 | 93 | -------------- |
|
91 | 94 | |
|
95 | created new head | |
|
92 | 96 | -------------- |
|
93 | 97 | test L:nm a b R:up a W: - 4 get remote change to b |
|
94 | 98 | -------------- |
@@ -117,6 +121,7 b' M b' | |||
|
117 | 121 | a |
|
118 | 122 | -------------- |
|
119 | 123 | |
|
124 | created new head | |
|
120 | 125 | -------------- |
|
121 | 126 | test L: R:nc a b W: - 5 get b |
|
122 | 127 | -------------- |
@@ -142,6 +147,7 b' M b' | |||
|
142 | 147 | C a |
|
143 | 148 | -------------- |
|
144 | 149 | |
|
150 | created new head | |
|
145 | 151 | -------------- |
|
146 | 152 | test L:nc a b R: W: - 6 nothing |
|
147 | 153 | -------------- |
@@ -165,6 +171,7 b' C a' | |||
|
165 | 171 | C b |
|
166 | 172 | -------------- |
|
167 | 173 | |
|
174 | created new head | |
|
168 | 175 | -------------- |
|
169 | 176 | test L: R:nm a b W: - 7 get b |
|
170 | 177 | -------------- |
@@ -191,6 +198,7 b' 1 files updated, 1 files merged, 1 files' | |||
|
191 | 198 | M b |
|
192 | 199 | -------------- |
|
193 | 200 | |
|
201 | created new head | |
|
194 | 202 | -------------- |
|
195 | 203 | test L:nm a b R: W: - 8 nothing |
|
196 | 204 | -------------- |
@@ -213,6 +221,7 b' 0 files updated, 1 files merged, 0 files' | |||
|
213 | 221 | C b |
|
214 | 222 | -------------- |
|
215 | 223 | |
|
224 | created new head | |
|
216 | 225 | -------------- |
|
217 | 226 | test L:um a b R:um a b W: - 9 do merge with ancestor in a |
|
218 | 227 | -------------- |
@@ -234,6 +243,7 b' 0 files updated, 2 files merged, 0 files' | |||
|
234 | 243 | M b |
|
235 | 244 | -------------- |
|
236 | 245 | |
|
246 | created new head | |
|
237 | 247 | -------------- |
|
238 | 248 | test L:nm a b R:nm a c W: - 11 get c, keep b |
|
239 | 249 | -------------- |
@@ -266,6 +276,7 b' M c' | |||
|
266 | 276 | C b |
|
267 | 277 | -------------- |
|
268 | 278 | |
|
279 | created new head | |
|
269 | 280 | -------------- |
|
270 | 281 | test L:nc a b R:up b W: - 12 merge b no ancestor |
|
271 | 282 | -------------- |
@@ -288,6 +299,7 b' M b' | |||
|
288 | 299 | C a |
|
289 | 300 | -------------- |
|
290 | 301 | |
|
302 | created new head | |
|
291 | 303 | -------------- |
|
292 | 304 | test L:up b R:nm a b W: - 13 merge b no ancestor |
|
293 | 305 | -------------- |
@@ -311,6 +323,7 b' 0 files updated, 2 files merged, 1 files' | |||
|
311 | 323 | M b |
|
312 | 324 | -------------- |
|
313 | 325 | |
|
326 | created new head | |
|
314 | 327 | -------------- |
|
315 | 328 | test L:nc a b R:up a b W: - 14 merge b no ancestor |
|
316 | 329 | -------------- |
@@ -335,6 +348,7 b' M a' | |||
|
335 | 348 | M b |
|
336 | 349 | -------------- |
|
337 | 350 | |
|
351 | created new head | |
|
338 | 352 | -------------- |
|
339 | 353 | test L:up b R:nm a b W: - 15 merge b no ancestor, remove a |
|
340 | 354 | -------------- |
@@ -358,6 +372,7 b' 0 files updated, 2 files merged, 1 files' | |||
|
358 | 372 | M b |
|
359 | 373 | -------------- |
|
360 | 374 | |
|
375 | created new head | |
|
361 | 376 | -------------- |
|
362 | 377 | test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
|
363 | 378 | -------------- |
@@ -382,6 +397,7 b' M a' | |||
|
382 | 397 | M b |
|
383 | 398 | -------------- |
|
384 | 399 | |
|
400 | created new head | |
|
385 | 401 | -------------- |
|
386 | 402 | test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
|
387 | 403 | -------------- |
@@ -404,6 +420,7 b' M b' | |||
|
404 | 420 | C a |
|
405 | 421 | -------------- |
|
406 | 422 | |
|
423 | created new head | |
|
407 | 424 | -------------- |
|
408 | 425 | test L:nm a b R:up a b W: - 18 merge b no ancestor |
|
409 | 426 | -------------- |
@@ -428,6 +445,7 b' M a' | |||
|
428 | 445 | M b |
|
429 | 446 | -------------- |
|
430 | 447 | |
|
448 | created new head | |
|
431 | 449 | -------------- |
|
432 | 450 | test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
|
433 | 451 | -------------- |
@@ -450,6 +468,7 b' M b' | |||
|
450 | 468 | C a |
|
451 | 469 | -------------- |
|
452 | 470 | |
|
471 | created new head | |
|
453 | 472 | -------------- |
|
454 | 473 | test L:up a R:um a b W: - 20 merge a and b to b, remove a |
|
455 | 474 | -------------- |
@@ -479,6 +498,7 b' M b' | |||
|
479 | 498 | a |
|
480 | 499 | -------------- |
|
481 | 500 | |
|
501 | created new head | |
|
482 | 502 | -------------- |
|
483 | 503 | test L:um a b R:up a W: - 21 merge a and b to b |
|
484 | 504 | -------------- |
@@ -506,6 +526,7 b' M b' | |||
|
506 | 526 | a |
|
507 | 527 | -------------- |
|
508 | 528 | |
|
529 | created new head | |
|
509 | 530 | -------------- |
|
510 | 531 | test L:nm a b R:up a c W: - 23 get c, keep b |
|
511 | 532 | -------------- |
@@ -68,6 +68,7 b' abort: no files or directories specified' | |||
|
68 | 68 | reverting a |
|
69 | 69 | %% issue332 |
|
70 | 70 | adding b/b |
|
71 | created new head | |
|
71 | 72 | reverting b/b |
|
72 | 73 | forgetting newdir/newfile |
|
73 | 74 | reverting b/b |
@@ -1,6 +1,7 b'' | |||
|
1 | 1 | adding foo |
|
2 | 2 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
3 | 3 | adding foo |
|
4 | created new head | |
|
4 | 5 | rev offset length base linkrev nodeid p1 p2 |
|
5 | 6 | 0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
|
6 | 7 | 1 0 24 0 1 0376abec49b8 000000000000 000000000000 |
@@ -1,5 +1,6 b'' | |||
|
1 | 1 | # creating 'remote' |
|
2 | 2 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3 | created new head | |
|
3 | 4 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
4 | 5 | rev offset length base linkrev nodeid p1 p2 |
|
5 | 6 | 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
@@ -70,6 +70,7 b' crosschecking files in changesets and ma' | |||
|
70 | 70 | checking files |
|
71 | 71 | 2 files, 2 changesets, 3 total revisions |
|
72 | 72 | bleah |
|
73 | created new head | |
|
73 | 74 | # push should succeed even though it has an unexpected response |
|
74 | 75 | pushing to ssh://user@dummy/remote |
|
75 | 76 | searching for changes |
@@ -13,6 +13,7 b' 0 files updated, 0 files merged, 1 files' | |||
|
13 | 13 | 0acdaf898367+ first |
|
14 | 14 | 0acdaf898367+ first |
|
15 | 15 | M a |
|
16 | created new head | |
|
16 | 17 | 8216907a933d tip |
|
17 | 18 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18 | 19 | (branch merge, don't forget to commit) |
@@ -21,6 +22,7 b' M .hgtags' | |||
|
21 | 22 | tip 6:e2174d339386 |
|
22 | 23 | first 0:0acdaf898367 |
|
23 | 24 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 | created new head | |
|
24 | 26 | .hgtags@c071f74ab5eb, line 2: cannot parse entry |
|
25 | 27 | .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed |
|
26 | 28 | .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed |
@@ -40,6 +42,7 b' summary: head' | |||
|
40 | 42 | |
|
41 | 43 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
42 | 44 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
45 | created new head | |
|
43 | 46 | tip 4:36195b728445 |
|
44 | 47 | bar 1:b204a97e6e8d |
|
45 | 48 | changeset: 5:57e1983b4a60 |
@@ -60,6 +63,7 b' summary: Removed tag bar' | |||
|
60 | 63 | tip 5:d8bb4d1eff25 |
|
61 | 64 | bar 0:b409d9da318e |
|
62 | 65 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 | created new head | |
|
63 | 67 | tip 6:b5ff9d142648 |
|
64 | 68 | bar 0:b409d9da318e |
|
65 | 69 | abort: tag 'bar' already exists (use -f to force) |
@@ -2,6 +2,7 b' adding r1' | |||
|
2 | 2 | adding r2 |
|
3 | 3 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
4 | 4 | adding b1 |
|
5 | created new head | |
|
5 | 6 | adding b2 |
|
6 | 7 | adding b3 |
|
7 | 8 | 4 b3 |
@@ -100,6 +101,7 b' adding added' | |||
|
100 | 101 | removing toremove |
|
101 | 102 | adding bar |
|
102 | 103 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
104 | created new head | |
|
103 | 105 | applying a1e30dd1b8e7 |
|
104 | 106 | patching file foo |
|
105 | 107 | Hunk #1 FAILED at 0 |
General Comments 0
You need to be logged in to leave comments.
Login now