Mercurial: comparison tests/test-graft.t

equal deleted inserted replaced

-:e172a1f2b5bb
+:bd5dbb8a05c8
 $ hg status --rev "2^1" --rev 2
 A b
 R a
 $ HGEDITOR=cat hg graft 2 -u foo --edit
-grafting revision 2
+grafting 2:5c095ad7e90f "2"
 merging a and b to b
 2
 HG: Enter commit message.  Lines beginning with 'HG:' are removed.
 (this also tests that editor is not invoked if '--edit' is not specified)
 $ hg graft 1 5 4 3 'merge()' 2 -n
 skipping ungraftable merge revision 6
 skipping revision 2 (already grafted to 7)
-grafting revision 1
+grafting 1:5d205f8b35b6 "1"
-grafting revision 5
+grafting 5:97f8bfe72746 "5"
-grafting revision 4
+grafting 4:9c233e8e184d "4"
-grafting revision 3
+grafting 3:4c60f11aa304 "3"
 $ HGEDITOR=cat hg graft 1 5 4 3 'merge()' 2 --debug
 skipping ungraftable merge revision 6
 scanning for duplicate grafts
 skipping revision 2 (already grafted to 7)
-grafting revision 1
+grafting 1:5d205f8b35b6 "1"
 searching for copies back to rev 1
 unmatched files in local:
 b
 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
 src: 'a' -> dst: 'b' *
 picked tool 'internal:merge' for b (binary False symlink False)
 merging b and a to b
 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
 premerge successful
 b
-grafting revision 5
+grafting 5:97f8bfe72746 "5"
 searching for copies back to rev 1
 resolving manifests
 branchmerge: True, force: True, partial: False
 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
 e: remote is newer -> g
 getting e
 updating: e 1/1 files (100.00%)
 b: remote unchanged -> k
 e
-grafting revision 4
+grafting 4:9c233e8e184d "4"
 searching for copies back to rev 1
 resolving manifests
 branchmerge: True, force: True, partial: False
 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
 preserving e for resolve of e
 $ hg graft 1 5 4 3 'merge()' 2
 skipping ungraftable merge revision 6
 skipping revision 2 (already grafted to 7)
 skipping revision 1 (already grafted to 8)
 skipping revision 5 (already grafted to 9)
-grafting revision 4
+grafting 4:9c233e8e184d "4"
 merging e
 warning: conflicts during merge.
 merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
 abort: unresolved conflicts, can't continue
 (use hg resolve and hg graft --continue)
 [255]
 Continue without resolve should fail:
 $ hg graft -c
-grafting revision 4
+grafting 4:9c233e8e184d "4"
 abort: unresolved merge conflicts (see hg help resolve)
 [255]
 Fix up:
 [255]
 Continue for real, clobber usernames
 $ hg graft -c -U
-grafting revision 4
+grafting 4:9c233e8e184d "4"
-grafting revision 3
+grafting 3:4c60f11aa304 "3"
 Compare with original:
 $ hg diff -r 6
 $ hg status --rev 0:. -C
 $ echo 'g'>g
 $ hg add g
 $ hg ci -m 7
 created new head
 $ hg graft 7
-grafting revision 7
+grafting 7:ef0ef43d49e7 "2"
 $ hg log -r 7 --template '{rev}:{node}\n'
 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
 $ hg log -r 2 --template '{rev}:{node}\n'
 2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4
 Graft with --log
 $ hg up -Cq 1
 $ hg graft 3 --log -u foo
-grafting revision 3
+grafting 3:4c60f11aa304 "3"
 warning: can't find ancestor for 'c' copied from 'b'!
 $ hg log --template '{rev} {parents} {desc}\n' -r tip
 14 1:5d205f8b35b6  3
 (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8)
 $ hg ci -m 8
 created new head
 $ echo c > a
 $ hg ci -m 9
 $ hg graft 1 --tool internal:fail
-grafting revision 1
+grafting 1:5d205f8b35b6 "1"
 abort: unresolved conflicts, can't continue
 (use hg resolve and hg graft --continue)
 [255]
 $ hg resolve --all
 merging a
 >>>>>>> other: 5d205f8b35b6  - bar: 1
 $ echo b > a
 $ hg resolve -m a
 (no more unresolved files)
 $ hg graft -c
-grafting revision 1
+grafting 1:5d205f8b35b6 "1"
 $ hg export tip --git
 # HG changeset patch
 # User bar
 # Date 0 0
 #      Thu Jan 01 00:00:00 1970 +0000
 Resolve conflicted graft with rename
 $ echo c > a
 $ hg ci -m 10
 $ hg graft 2 --tool internal:fail
-grafting revision 2
+grafting 2:5c095ad7e90f "2"
 abort: unresolved conflicts, can't continue
 (use hg resolve and hg graft --continue)
 [255]
 $ hg resolve --all
 merging a and b to b
 (no more unresolved files)
 $ hg graft -c
-grafting revision 2
+grafting 2:5c095ad7e90f "2"
 $ hg export tip --git
 # HG changeset patch
 # User test
 # Date 0 0
 #      Thu Jan 01 00:00:00 1970 +0000
 $ hg graft 'origin(13) or destination(origin(13))'
 skipping ancestor revision 21
 skipping ancestor revision 22
 skipping revision 2 (already grafted to 22)
-grafting revision 7
+grafting 7:ef0ef43d49e7 "2"
-grafting revision 13
+grafting 13:9db0f28fd374 "2"
-grafting revision 19
+grafting 19:9627f653b421 "2"
 merging b
 graft with --force (still doesn't graft merges)
 $ hg graft 19 0 6
 skipping ancestor revision 0
 skipping already grafted revision 19 (22 also has origin 2)
 [255]
 $ hg graft 19 0 6 --force
 skipping ungraftable merge revision 6
-grafting revision 19
+grafting 19:9627f653b421 "2"
 merging b
-grafting revision 0
+grafting 0:68795b066622 "0"
 graft --force after backout
 $ echo abc > a
 $ hg ci -m 28
 changeset 29:484c03b8dfa4 backs out changeset 28:6c56f0f7f033
 $ hg graft 28
 skipping ancestor revision 28
 [255]
 $ hg graft 28 --force
-grafting revision 28
+grafting 28:6c56f0f7f033 "28"
 merging a
 $ cat a
 abc
 graft --continue after --force
 $ echo def > a
 $ hg ci -m 31
 $ hg graft 28 --force --tool internal:fail
-grafting revision 28
+grafting 28:6c56f0f7f033 "28"
 abort: unresolved conflicts, can't continue
 (use hg resolve and hg graft --continue)
 [255]
 $ hg resolve --all
 merging a
 [1]
 $ echo abc > a
 $ hg resolve -m a
 (no more unresolved files)
 $ hg graft -c
-grafting revision 28
+grafting 28:6c56f0f7f033 "28"
 $ cat a
 abc
 Continue testing same origin policy, using revision numbers from test above
 but do some destructive editing of the repo:

changeset 23505	bd5dbb8a05c8
parent 23504	e172a1f2b5bb
child 23506	dc82f1a7436d