2011-10-25 02:01:49 +04:00
|
|
|
Create a repo with some stuff in it:
|
|
|
|
|
|
|
|
$ hg init a
|
|
|
|
$ cd a
|
|
|
|
$ echo a > a
|
|
|
|
$ echo a > d
|
|
|
|
$ echo a > e
|
|
|
|
$ hg ci -qAm0
|
|
|
|
$ echo b > a
|
|
|
|
$ hg ci -m1 -u bar
|
|
|
|
$ hg mv a b
|
|
|
|
$ hg ci -m2
|
|
|
|
$ hg cp b c
|
|
|
|
$ hg ci -m3 -u baz
|
|
|
|
$ echo b > d
|
|
|
|
$ echo f > e
|
|
|
|
$ hg ci -m4
|
|
|
|
$ hg up -q 3
|
|
|
|
$ echo b > e
|
|
|
|
$ hg branch -q stable
|
|
|
|
$ hg ci -m5
|
|
|
|
$ hg merge -q default --tool internal:local
|
|
|
|
$ hg branch -q default
|
|
|
|
$ hg ci -m6
|
2012-01-17 14:08:23 +04:00
|
|
|
$ hg phase --public 3
|
|
|
|
$ hg phase --force --secret 6
|
|
|
|
|
2013-11-22 22:14:17 +04:00
|
|
|
$ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
|
2012-01-17 14:08:23 +04:00
|
|
|
@ test@6.secret: 6
|
|
|
|
|\
|
|
|
|
| o test@5.draft: 5
|
|
|
|
| |
|
|
|
|
o | test@4.draft: 4
|
|
|
|
|/
|
|
|
|
o baz@3.public: 3
|
|
|
|
|
|
|
|
|
o test@2.public: 2
|
|
|
|
|
|
|
|
|
o bar@1.public: 1
|
|
|
|
|
|
|
|
|
o test@0.public: 0
|
|
|
|
|
2011-10-25 02:01:49 +04:00
|
|
|
|
|
|
|
Need to specify a rev:
|
|
|
|
|
|
|
|
$ hg graft
|
|
|
|
abort: no revisions specified
|
|
|
|
[255]
|
|
|
|
|
|
|
|
Can't graft ancestor:
|
|
|
|
|
|
|
|
$ hg graft 1 2
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping ancestor revision 1:5d205f8b35b6
|
|
|
|
skipping ancestor revision 2:5c095ad7e90f
|
2011-10-25 02:01:49 +04:00
|
|
|
[255]
|
|
|
|
|
2012-06-20 19:02:43 +04:00
|
|
|
Specify revisions with -r:
|
|
|
|
|
|
|
|
$ hg graft -r 1 -r 2
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping ancestor revision 1:5d205f8b35b6
|
|
|
|
skipping ancestor revision 2:5c095ad7e90f
|
2012-06-20 19:02:43 +04:00
|
|
|
[255]
|
|
|
|
|
|
|
|
$ hg graft -r 1 2
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping ancestor revision 2:5c095ad7e90f
|
|
|
|
skipping ancestor revision 1:5d205f8b35b6
|
2012-06-20 19:02:43 +04:00
|
|
|
[255]
|
|
|
|
|
2011-10-25 02:01:49 +04:00
|
|
|
Can't graft with dirty wd:
|
|
|
|
|
|
|
|
$ hg up -q 0
|
|
|
|
$ echo foo > a
|
|
|
|
$ hg graft 1
|
2013-09-24 08:31:37 +04:00
|
|
|
abort: uncommitted changes
|
2011-10-25 02:01:49 +04:00
|
|
|
[255]
|
|
|
|
$ hg revert a
|
|
|
|
|
|
|
|
Graft a rename:
|
2014-05-10 19:49:36 +04:00
|
|
|
(this also tests that editor is invoked if '--edit' is specified)
|
2011-10-25 02:01:49 +04:00
|
|
|
|
2014-05-10 19:49:36 +04:00
|
|
|
$ hg status --rev "2^1" --rev 2
|
|
|
|
A b
|
|
|
|
R a
|
|
|
|
$ HGEDITOR=cat hg graft 2 -u foo --edit
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 2:5c095ad7e90f "2"
|
2011-10-25 02:01:49 +04:00
|
|
|
merging a and b to b
|
2014-05-10 19:49:36 +04:00
|
|
|
2
|
|
|
|
|
|
|
|
|
|
|
|
HG: Enter commit message. Lines beginning with 'HG:' are removed.
|
|
|
|
HG: Leave message empty to abort commit.
|
|
|
|
HG: --
|
|
|
|
HG: user: foo
|
|
|
|
HG: branch 'default'
|
2014-10-11 23:05:09 +04:00
|
|
|
HG: added b
|
2014-05-10 19:49:36 +04:00
|
|
|
HG: removed a
|
2011-10-25 02:01:49 +04:00
|
|
|
$ hg export tip --git
|
|
|
|
# HG changeset patch
|
|
|
|
# User foo
|
|
|
|
# Date 0 0
|
2013-02-09 01:54:17 +04:00
|
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
2012-05-06 23:20:53 +04:00
|
|
|
# Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82
|
2011-10-25 02:01:49 +04:00
|
|
|
# Parent 68795b066622ca79a25816a662041d8f78f3cd9e
|
|
|
|
2
|
|
|
|
|
|
|
|
diff --git a/a b/b
|
|
|
|
rename from a
|
|
|
|
rename to b
|
|
|
|
|
|
|
|
Look for extra:source
|
|
|
|
|
|
|
|
$ hg log --debug -r tip
|
2012-05-06 23:20:53 +04:00
|
|
|
changeset: 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
|
2011-10-25 02:01:49 +04:00
|
|
|
tag: tip
|
2012-01-17 23:23:23 +04:00
|
|
|
phase: draft
|
2011-10-25 02:01:49 +04:00
|
|
|
parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e
|
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
2012-05-06 23:20:53 +04:00
|
|
|
manifest: 7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb
|
2011-10-25 02:01:49 +04:00
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
files+: b
|
|
|
|
files-: a
|
|
|
|
extra: branch=default
|
|
|
|
extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
|
|
|
|
description:
|
|
|
|
2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Graft out of order, skipping a merge and a duplicate
|
2014-05-10 19:49:36 +04:00
|
|
|
(this also tests that editor is not invoked if '--edit' is not specified)
|
2011-10-25 02:01:49 +04:00
|
|
|
|
2012-04-10 21:49:12 +04:00
|
|
|
$ hg graft 1 5 4 3 'merge()' 2 -n
|
|
|
|
skipping ungraftable merge revision 6
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 1:5d205f8b35b6 "1"
|
|
|
|
grafting 5:97f8bfe72746 "5"
|
|
|
|
grafting 4:9c233e8e184d "4"
|
|
|
|
grafting 3:4c60f11aa304 "3"
|
2012-04-10 21:49:12 +04:00
|
|
|
|
2014-05-10 19:49:36 +04:00
|
|
|
$ HGEDITOR=cat hg graft 1 5 4 3 'merge()' 2 --debug
|
2011-10-25 02:01:49 +04:00
|
|
|
skipping ungraftable merge revision 6
|
|
|
|
scanning for duplicate grafts
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 1:5d205f8b35b6 "1"
|
2011-10-25 02:01:49 +04:00
|
|
|
searching for copies back to rev 1
|
|
|
|
unmatched files in local:
|
|
|
|
b
|
2012-05-23 23:34:29 +04:00
|
|
|
all copies found (* = to merge, ! = divergent, % = renamed and deleted):
|
2012-12-27 03:03:58 +04:00
|
|
|
src: 'a' -> dst: 'b' *
|
2011-10-25 02:01:49 +04:00
|
|
|
checking for directory renames
|
|
|
|
resolving manifests
|
2013-02-08 19:23:23 +04:00
|
|
|
branchmerge: True, force: True, partial: False
|
2012-05-06 23:20:53 +04:00
|
|
|
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
|
2014-04-22 04:10:25 +04:00
|
|
|
preserving b for resolve of b
|
2014-03-02 21:52:16 +04:00
|
|
|
b: local copied/moved from a -> m
|
2011-10-25 02:01:49 +04:00
|
|
|
updating: b 1/1 files (100.00%)
|
2012-05-06 23:20:53 +04:00
|
|
|
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
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 5:97f8bfe72746 "5"
|
2011-10-25 02:01:49 +04:00
|
|
|
searching for copies back to rev 1
|
|
|
|
resolving manifests
|
2013-02-08 19:23:23 +04:00
|
|
|
branchmerge: True, force: True, partial: False
|
2012-05-06 23:20:53 +04:00
|
|
|
ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
|
2011-10-25 02:01:49 +04:00
|
|
|
e: remote is newer -> g
|
|
|
|
getting e
|
2013-02-10 03:22:04 +04:00
|
|
|
updating: e 1/1 files (100.00%)
|
2014-12-04 01:03:20 +03:00
|
|
|
b: remote unchanged -> k
|
2011-10-25 02:01:49 +04:00
|
|
|
e
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 4:9c233e8e184d "4"
|
2011-10-25 02:01:49 +04:00
|
|
|
searching for copies back to rev 1
|
|
|
|
resolving manifests
|
2013-02-08 19:23:23 +04:00
|
|
|
branchmerge: True, force: True, partial: False
|
2012-05-06 23:20:53 +04:00
|
|
|
ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
|
2014-04-22 04:10:25 +04:00
|
|
|
preserving e for resolve of e
|
2011-10-25 02:01:49 +04:00
|
|
|
d: remote is newer -> g
|
|
|
|
getting d
|
2013-02-10 03:22:04 +04:00
|
|
|
updating: d 1/2 files (50.00%)
|
2014-12-04 01:03:20 +03:00
|
|
|
b: remote unchanged -> k
|
2014-04-22 04:10:25 +04:00
|
|
|
e: versions differ -> m
|
2011-10-25 02:01:49 +04:00
|
|
|
updating: e 2/2 files (100.00%)
|
|
|
|
picked tool 'internal:merge' for e (binary False symlink False)
|
|
|
|
merging e
|
2012-05-06 23:20:53 +04:00
|
|
|
my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
|
2011-10-25 02:01:49 +04:00
|
|
|
warning: conflicts during merge.
|
2011-11-17 04:04:19 +04:00
|
|
|
merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
|
2011-10-25 02:01:49 +04:00
|
|
|
abort: unresolved conflicts, can't continue
|
|
|
|
(use hg resolve and hg graft --continue)
|
|
|
|
[255]
|
2013-05-31 01:32:10 +04:00
|
|
|
|
|
|
|
Commit while interrupted should fail:
|
|
|
|
|
|
|
|
$ hg ci -m 'commit interrupted graft'
|
2013-07-25 08:51:40 +04:00
|
|
|
abort: graft in progress
|
|
|
|
(use 'hg graft --continue' or 'hg update' to abort)
|
2013-05-31 01:32:10 +04:00
|
|
|
[255]
|
2013-06-29 03:58:31 +04:00
|
|
|
|
|
|
|
Abort the graft and try committing:
|
|
|
|
|
|
|
|
$ hg up -C .
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ echo c >> e
|
|
|
|
$ hg ci -mtest
|
|
|
|
|
2014-12-09 22:45:12 +03:00
|
|
|
$ hg strip . --config extensions.strip=
|
2013-06-29 03:58:31 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
|
|
|
|
|
|
|
|
Graft again:
|
|
|
|
|
|
|
|
$ hg graft 1 5 4 3 'merge()' 2
|
|
|
|
skipping ungraftable merge revision 6
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
|
|
|
|
skipping revision 1:5d205f8b35b6 (already grafted to 8:6b9e5368ca4e)
|
|
|
|
skipping revision 5:97f8bfe72746 (already grafted to 9:1905859650ec)
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 4:9c233e8e184d "4"
|
2013-06-29 03:58:31 +04:00
|
|
|
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]
|
2011-10-25 02:01:49 +04:00
|
|
|
|
|
|
|
Continue without resolve should fail:
|
|
|
|
|
|
|
|
$ hg graft -c
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 4:9c233e8e184d "4"
|
2011-10-25 02:01:49 +04:00
|
|
|
abort: unresolved merge conflicts (see hg help resolve)
|
|
|
|
[255]
|
|
|
|
|
|
|
|
Fix up:
|
|
|
|
|
|
|
|
$ echo b > e
|
|
|
|
$ hg resolve -m e
|
2014-07-26 05:32:49 +04:00
|
|
|
(no more unresolved files)
|
2011-10-25 02:01:49 +04:00
|
|
|
|
|
|
|
Continue with a revision should fail:
|
|
|
|
|
|
|
|
$ hg graft -c 6
|
|
|
|
abort: can't specify --continue and revisions
|
|
|
|
[255]
|
|
|
|
|
2012-06-20 19:02:43 +04:00
|
|
|
$ hg graft -c -r 6
|
|
|
|
abort: can't specify --continue and revisions
|
|
|
|
[255]
|
|
|
|
|
2011-10-25 02:01:49 +04:00
|
|
|
Continue for real, clobber usernames
|
|
|
|
|
|
|
|
$ hg graft -c -U
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 4:9c233e8e184d "4"
|
|
|
|
grafting 3:4c60f11aa304 "3"
|
2011-10-25 02:01:49 +04:00
|
|
|
|
|
|
|
Compare with original:
|
|
|
|
|
|
|
|
$ hg diff -r 6
|
|
|
|
$ hg status --rev 0:. -C
|
|
|
|
M d
|
|
|
|
M e
|
|
|
|
A b
|
|
|
|
a
|
|
|
|
A c
|
|
|
|
a
|
|
|
|
R a
|
|
|
|
|
|
|
|
View graph:
|
|
|
|
|
2013-11-22 22:14:17 +04:00
|
|
|
$ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
|
2012-05-06 23:20:53 +04:00
|
|
|
@ test@11.draft: 3
|
2011-10-25 02:01:49 +04:00
|
|
|
|
|
2012-05-06 23:20:53 +04:00
|
|
|
o test@10.draft: 4
|
2011-10-25 02:01:49 +04:00
|
|
|
|
|
2012-05-06 23:20:53 +04:00
|
|
|
o test@9.draft: 5
|
|
|
|
|
|
|
|
|
o bar@8.draft: 1
|
2011-10-25 02:01:49 +04:00
|
|
|
|
|
2012-01-17 14:08:23 +04:00
|
|
|
o foo@7.draft: 2
|
2011-10-25 02:01:49 +04:00
|
|
|
|
|
2012-01-17 14:08:23 +04:00
|
|
|
| o test@6.secret: 6
|
2011-10-25 02:01:49 +04:00
|
|
|
| |\
|
2012-01-17 14:08:23 +04:00
|
|
|
| | o test@5.draft: 5
|
2011-10-25 02:01:49 +04:00
|
|
|
| | |
|
2012-01-17 14:08:23 +04:00
|
|
|
| o | test@4.draft: 4
|
2011-10-25 02:01:49 +04:00
|
|
|
| |/
|
2012-01-17 14:08:23 +04:00
|
|
|
| o baz@3.public: 3
|
2011-10-25 02:01:49 +04:00
|
|
|
| |
|
2012-01-17 14:08:23 +04:00
|
|
|
| o test@2.public: 2
|
2011-10-25 02:01:49 +04:00
|
|
|
| |
|
2012-01-17 14:08:23 +04:00
|
|
|
| o bar@1.public: 1
|
2011-10-25 02:01:49 +04:00
|
|
|
|/
|
2012-01-17 14:08:23 +04:00
|
|
|
o test@0.public: 0
|
2011-10-25 02:01:49 +04:00
|
|
|
|
2011-11-12 16:15:40 +04:00
|
|
|
Graft again onto another branch should preserve the original source
|
|
|
|
$ hg up -q 0
|
|
|
|
$ echo 'g'>g
|
|
|
|
$ hg add g
|
|
|
|
$ hg ci -m 7
|
|
|
|
created new head
|
|
|
|
$ hg graft 7
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 7:ef0ef43d49e7 "2"
|
2011-11-12 16:15:40 +04:00
|
|
|
|
|
|
|
$ hg log -r 7 --template '{rev}:{node}\n'
|
2012-05-06 23:20:53 +04:00
|
|
|
7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
|
2011-11-12 16:15:40 +04:00
|
|
|
$ hg log -r 2 --template '{rev}:{node}\n'
|
|
|
|
2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4
|
|
|
|
|
|
|
|
$ hg log --debug -r tip
|
2012-05-06 23:20:53 +04:00
|
|
|
changeset: 13:9db0f28fd3747e92c57d015f53b5593aeec53c2d
|
2011-11-12 16:15:40 +04:00
|
|
|
tag: tip
|
2012-01-17 23:23:23 +04:00
|
|
|
phase: draft
|
2012-05-06 23:20:53 +04:00
|
|
|
parent: 12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
|
2011-11-12 16:15:40 +04:00
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
2012-05-06 23:20:53 +04:00
|
|
|
manifest: 13:dc313617b8c32457c0d589e0dbbedfe71f3cd637
|
2011-11-12 16:15:40 +04:00
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
files+: b
|
|
|
|
files-: a
|
|
|
|
extra: branch=default
|
|
|
|
extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
|
|
|
|
description:
|
|
|
|
2
|
|
|
|
|
|
|
|
|
2011-11-12 17:00:25 +04:00
|
|
|
Disallow grafting an already grafted cset onto its original branch
|
|
|
|
$ hg up -q 6
|
|
|
|
$ hg graft 7
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f)
|
2011-11-12 17:00:25 +04:00
|
|
|
[255]
|
|
|
|
|
|
|
|
Disallow grafting already grafted csets with the same origin onto each other
|
2012-05-06 23:20:53 +04:00
|
|
|
$ hg up -q 13
|
2011-11-12 17:00:25 +04:00
|
|
|
$ hg graft 2
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping revision 2:5c095ad7e90f (already grafted to 13:9db0f28fd374)
|
2011-11-12 17:00:25 +04:00
|
|
|
[255]
|
|
|
|
$ hg graft 7
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping already grafted revision 7:ef0ef43d49e7 (13:9db0f28fd374 also has origin 2:5c095ad7e90f)
|
2011-11-12 17:00:25 +04:00
|
|
|
[255]
|
|
|
|
|
|
|
|
$ hg up -q 7
|
|
|
|
$ hg graft 2
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
|
2011-11-12 17:00:25 +04:00
|
|
|
[255]
|
|
|
|
$ hg graft tip
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping already grafted revision 13:9db0f28fd374 (7:ef0ef43d49e7 also has origin 2:5c095ad7e90f)
|
2011-11-12 17:00:25 +04:00
|
|
|
[255]
|
2012-05-11 20:51:35 +04:00
|
|
|
|
|
|
|
Graft with --log
|
|
|
|
|
|
|
|
$ hg up -Cq 1
|
|
|
|
$ hg graft 3 --log -u foo
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 3:4c60f11aa304 "3"
|
2012-05-11 20:51:35 +04:00
|
|
|
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)
|
2012-06-11 03:40:51 +04:00
|
|
|
|
2012-06-16 12:05:55 +04:00
|
|
|
Resolve conflicted graft
|
|
|
|
$ hg up -q 0
|
|
|
|
$ echo b > a
|
|
|
|
$ hg ci -m 8
|
|
|
|
created new head
|
2014-12-04 02:03:29 +03:00
|
|
|
$ echo c > a
|
2012-06-16 12:05:55 +04:00
|
|
|
$ hg ci -m 9
|
|
|
|
$ hg graft 1 --tool internal:fail
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 1:5d205f8b35b6 "1"
|
2012-06-16 12:05:55 +04:00
|
|
|
abort: unresolved conflicts, can't continue
|
|
|
|
(use hg resolve and hg graft --continue)
|
|
|
|
[255]
|
|
|
|
$ hg resolve --all
|
|
|
|
merging a
|
2014-12-04 02:03:29 +03:00
|
|
|
warning: conflicts during merge.
|
|
|
|
merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
|
|
[1]
|
|
|
|
$ cat a
|
|
|
|
<<<<<<< local: aaa4406d4f0a - test: 9
|
|
|
|
c
|
|
|
|
=======
|
|
|
|
b
|
|
|
|
>>>>>>> other: 5d205f8b35b6 - bar: 1
|
|
|
|
$ echo b > a
|
|
|
|
$ hg resolve -m a
|
2014-07-26 05:32:49 +04:00
|
|
|
(no more unresolved files)
|
2012-06-16 12:05:55 +04:00
|
|
|
$ hg graft -c
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 1:5d205f8b35b6 "1"
|
2012-06-16 12:05:55 +04:00
|
|
|
$ hg export tip --git
|
|
|
|
# HG changeset patch
|
|
|
|
# User bar
|
|
|
|
# Date 0 0
|
2013-02-09 01:54:17 +04:00
|
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
2014-12-04 02:03:29 +03:00
|
|
|
# Node ID f67661df0c4804d301f064f332b57e7d5ddaf2be
|
|
|
|
# Parent aaa4406d4f0ae9befd6e58c82ec63706460cbca6
|
2012-06-16 12:05:55 +04:00
|
|
|
1
|
|
|
|
|
|
|
|
diff --git a/a b/a
|
|
|
|
--- a/a
|
|
|
|
+++ b/a
|
|
|
|
@@ -1,1 +1,1 @@
|
2014-12-04 02:03:29 +03:00
|
|
|
-c
|
2012-06-16 12:05:55 +04:00
|
|
|
+b
|
|
|
|
|
|
|
|
Resolve conflicted graft with rename
|
|
|
|
$ echo c > a
|
|
|
|
$ hg ci -m 10
|
|
|
|
$ hg graft 2 --tool internal:fail
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 2:5c095ad7e90f "2"
|
2012-06-16 12:05:55 +04:00
|
|
|
abort: unresolved conflicts, can't continue
|
|
|
|
(use hg resolve and hg graft --continue)
|
|
|
|
[255]
|
|
|
|
$ hg resolve --all
|
|
|
|
merging a and b to b
|
2014-07-26 05:32:49 +04:00
|
|
|
(no more unresolved files)
|
2012-06-16 12:05:55 +04:00
|
|
|
$ hg graft -c
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 2:5c095ad7e90f "2"
|
2012-06-16 12:05:55 +04:00
|
|
|
$ hg export tip --git
|
|
|
|
# HG changeset patch
|
|
|
|
# User test
|
|
|
|
# Date 0 0
|
2013-02-09 01:54:17 +04:00
|
|
|
# Thu Jan 01 00:00:00 1970 +0000
|
2014-12-04 02:03:29 +03:00
|
|
|
# Node ID 9627f653b421c61fc1ea4c4e366745070fa3d2bc
|
|
|
|
# Parent ee295f490a40b97f3d18dd4c4f1c8936c233b612
|
2012-06-16 12:05:55 +04:00
|
|
|
2
|
|
|
|
|
|
|
|
diff --git a/a b/b
|
|
|
|
rename from a
|
|
|
|
rename to b
|
2012-07-07 08:47:30 +04:00
|
|
|
|
|
|
|
Test simple origin(), with and without args
|
|
|
|
$ hg log -r 'origin()'
|
|
|
|
changeset: 1:5d205f8b35b6
|
|
|
|
user: bar
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 1
|
|
|
|
|
|
|
|
changeset: 2:5c095ad7e90f
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 3:4c60f11aa304
|
|
|
|
user: baz
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 3
|
|
|
|
|
|
|
|
changeset: 4:9c233e8e184d
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 4
|
|
|
|
|
|
|
|
changeset: 5:97f8bfe72746
|
|
|
|
branch: stable
|
|
|
|
parent: 3:4c60f11aa304
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 5
|
|
|
|
|
|
|
|
$ hg log -r 'origin(7)'
|
|
|
|
changeset: 2:5c095ad7e90f
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
Now transplant a graft to test following through copies
|
|
|
|
$ hg up -q 0
|
|
|
|
$ hg branch -q dev
|
|
|
|
$ hg ci -qm "dev branch"
|
|
|
|
$ hg --config extensions.transplant= transplant -q 7
|
|
|
|
$ hg log -r 'origin(.)'
|
|
|
|
changeset: 2:5c095ad7e90f
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
2014-06-12 06:19:29 +04:00
|
|
|
Test that the graft and transplant markers in extra are converted, allowing
|
|
|
|
origin() to still work. Note that these recheck the immediately preceeding two
|
|
|
|
tests.
|
|
|
|
$ hg --quiet --config extensions.convert= --config convert.hg.saverev=True convert . ../converted
|
|
|
|
|
|
|
|
The graft case
|
|
|
|
$ hg -R ../converted log -r 7 --template "{rev}: {node}\n{join(extras, '\n')}\n"
|
|
|
|
7: 7ae846e9111fc8f57745634250c7b9ac0a60689b
|
|
|
|
branch=default
|
|
|
|
convert_revision=ef0ef43d49e79e81ddafdc7997401ba0041efc82
|
|
|
|
source=e0213322b2c1a5d5d236c74e79666441bee67a7d
|
|
|
|
$ hg -R ../converted log -r 'origin(7)'
|
|
|
|
changeset: 2:e0213322b2c1
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
This keyword remapping was introduced in 236440938a03 as part of converting
generator based iterators into list based iterators, mentioning "undesired
behavior in template" when a generator is exhausted, but doesn't say what and
introduces no tests.
The problem with the remapping was that it corrupted the output for keywords
like 'extras', 'file_copies' and 'file_copies_switch' in templates such as:
$ hg log -r 82a4f5557c6b --template "{file_copies % ' File: {file_copy}\n'}"
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
File: mercurial/changelog.py (mercurial/hg.py)
What was happening was that in the first call to runtemplate() inside runmap(),
'lm' mapped the keyword (e.g. file_copies) to the appropriate showxxx() method.
On each subsequent call to runtemplate() in that loop however, the keyword was
mapped to a list of the first item's pieces, e.g.:
'file_copy': ['mercurial/changelog.py', ' (', 'mercurial/hg.py', ')']
Therefore, the dict for the second and any subsequent items were not processed
through the corresponding showxxx() method, and the first item's data was
reused.
The 'extras' keyword regressed in 56b014c52204, and 'file_copies' regressed in
4e182fb53989 for other reasons. The common thread of things fixed by this seems
to be when a list of dicts are passed to the templatekw._hybrid class.
2014-11-03 20:08:03 +03:00
|
|
|
Test that template correctly expands more than one 'extra' (issue4362)
|
|
|
|
$ hg -R ../converted log -r 7 --template "{extras % ' Extra: {extra}\n'}"
|
|
|
|
Extra: branch=default
|
|
|
|
Extra: convert_revision=ef0ef43d49e79e81ddafdc7997401ba0041efc82
|
|
|
|
Extra: source=e0213322b2c1a5d5d236c74e79666441bee67a7d
|
|
|
|
|
2014-06-12 06:19:29 +04:00
|
|
|
The transplant case
|
|
|
|
$ hg -R ../converted log -r tip --template "{rev}: {node}\n{join(extras, '\n')}\n"
|
|
|
|
21: fbb6c5cc81002f2b4b49c9d731404688bcae5ade
|
|
|
|
branch=dev
|
|
|
|
convert_revision=7e61b508e709a11d28194a5359bc3532d910af21
|
|
|
|
transplant_source=z\xe8F\xe9\x11\x1f\xc8\xf5wEcBP\xc7\xb9\xac (esc)
|
|
|
|
`h\x9b (esc)
|
|
|
|
$ hg -R ../converted log -r 'origin(tip)'
|
|
|
|
changeset: 2:e0213322b2c1
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
|
revset: add destination() predicate
This predicate is used to find csets that were created because of a graft,
transplant or rebase --keep. An optional revset can be supplied, in which case
the result will be limited to those copies which specified one of the revs as
the source for the command.
hg log -r destination() # csets copied from anywhere
hg log -r destination(branch(default)) # all csets copied from default
hg log -r origin(x) or destination(origin(x)) # all instances of x
This predicate will follow a cset through different types of copies. Given a
repo with a cset 'S' that is grafted to create G(S), which itself is
transplanted to become T(G(S)):
o-S
/
o-o-G(S)
\
o-T(G(S))
hg log -r destination( S ) # { G(S), T(G(S)) }
hg log -r destination( G(S) ) # { T(G(S)) }
The implementation differences between the three different copy commands (see
the origin() predicate) are not intentionally exposed, however if the
transplant was a graft instead:
hg log -r destination( G(S) ) # {}
because the 'extra' field in G(G(S)) is S, not G(S). The implementation cannot
correct this by following sources before G(S) and then select the csets that
reference those sources because the cset provided to the predicate would also
end up selected. If there were more than two copies, sources of the argument
would also get selected.
Note that the convert extension does not currently update the 'extra' map in its
destination csets, and therefore copies made prior to the convert will be
missing from the resulting set.
Instead of the loop over 'subset', the following almost works, but does not
select a transplant of a transplant. That is, 'destination(S)' will only
select T(S).
dests = set([r for r in subset if _getrevsource(repo, r) in args])
2012-07-07 08:47:55 +04:00
|
|
|
Test simple destination
|
|
|
|
$ hg log -r 'destination()'
|
|
|
|
changeset: 7:ef0ef43d49e7
|
|
|
|
parent: 0:68795b066622
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 8:6b9e5368ca4e
|
|
|
|
user: bar
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 1
|
|
|
|
|
|
|
|
changeset: 9:1905859650ec
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 5
|
|
|
|
|
|
|
|
changeset: 10:52dc0b4c6907
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 4
|
|
|
|
|
|
|
|
changeset: 11:882b35362a6b
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 3
|
|
|
|
|
|
|
|
changeset: 13:9db0f28fd374
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 14:f64defefacee
|
|
|
|
parent: 1:5d205f8b35b6
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 3
|
|
|
|
|
2014-12-04 02:03:29 +03:00
|
|
|
changeset: 17:f67661df0c48
|
revset: add destination() predicate
This predicate is used to find csets that were created because of a graft,
transplant or rebase --keep. An optional revset can be supplied, in which case
the result will be limited to those copies which specified one of the revs as
the source for the command.
hg log -r destination() # csets copied from anywhere
hg log -r destination(branch(default)) # all csets copied from default
hg log -r origin(x) or destination(origin(x)) # all instances of x
This predicate will follow a cset through different types of copies. Given a
repo with a cset 'S' that is grafted to create G(S), which itself is
transplanted to become T(G(S)):
o-S
/
o-o-G(S)
\
o-T(G(S))
hg log -r destination( S ) # { G(S), T(G(S)) }
hg log -r destination( G(S) ) # { T(G(S)) }
The implementation differences between the three different copy commands (see
the origin() predicate) are not intentionally exposed, however if the
transplant was a graft instead:
hg log -r destination( G(S) ) # {}
because the 'extra' field in G(G(S)) is S, not G(S). The implementation cannot
correct this by following sources before G(S) and then select the csets that
reference those sources because the cset provided to the predicate would also
end up selected. If there were more than two copies, sources of the argument
would also get selected.
Note that the convert extension does not currently update the 'extra' map in its
destination csets, and therefore copies made prior to the convert will be
missing from the resulting set.
Instead of the loop over 'subset', the following almost works, but does not
select a transplant of a transplant. That is, 'destination(S)' will only
select T(S).
dests = set([r for r in subset if _getrevsource(repo, r) in args])
2012-07-07 08:47:55 +04:00
|
|
|
user: bar
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 1
|
|
|
|
|
2014-12-04 02:03:29 +03:00
|
|
|
changeset: 19:9627f653b421
|
revset: add destination() predicate
This predicate is used to find csets that were created because of a graft,
transplant or rebase --keep. An optional revset can be supplied, in which case
the result will be limited to those copies which specified one of the revs as
the source for the command.
hg log -r destination() # csets copied from anywhere
hg log -r destination(branch(default)) # all csets copied from default
hg log -r origin(x) or destination(origin(x)) # all instances of x
This predicate will follow a cset through different types of copies. Given a
repo with a cset 'S' that is grafted to create G(S), which itself is
transplanted to become T(G(S)):
o-S
/
o-o-G(S)
\
o-T(G(S))
hg log -r destination( S ) # { G(S), T(G(S)) }
hg log -r destination( G(S) ) # { T(G(S)) }
The implementation differences between the three different copy commands (see
the origin() predicate) are not intentionally exposed, however if the
transplant was a graft instead:
hg log -r destination( G(S) ) # {}
because the 'extra' field in G(G(S)) is S, not G(S). The implementation cannot
correct this by following sources before G(S) and then select the csets that
reference those sources because the cset provided to the predicate would also
end up selected. If there were more than two copies, sources of the argument
would also get selected.
Note that the convert extension does not currently update the 'extra' map in its
destination csets, and therefore copies made prior to the convert will be
missing from the resulting set.
Instead of the loop over 'subset', the following almost works, but does not
select a transplant of a transplant. That is, 'destination(S)' will only
select T(S).
dests = set([r for r in subset if _getrevsource(repo, r) in args])
2012-07-07 08:47:55 +04:00
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 21:7e61b508e709
|
|
|
|
branch: dev
|
|
|
|
tag: tip
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
$ hg log -r 'destination(2)'
|
|
|
|
changeset: 7:ef0ef43d49e7
|
|
|
|
parent: 0:68795b066622
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 13:9db0f28fd374
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
2014-12-04 02:03:29 +03:00
|
|
|
changeset: 19:9627f653b421
|
revset: add destination() predicate
This predicate is used to find csets that were created because of a graft,
transplant or rebase --keep. An optional revset can be supplied, in which case
the result will be limited to those copies which specified one of the revs as
the source for the command.
hg log -r destination() # csets copied from anywhere
hg log -r destination(branch(default)) # all csets copied from default
hg log -r origin(x) or destination(origin(x)) # all instances of x
This predicate will follow a cset through different types of copies. Given a
repo with a cset 'S' that is grafted to create G(S), which itself is
transplanted to become T(G(S)):
o-S
/
o-o-G(S)
\
o-T(G(S))
hg log -r destination( S ) # { G(S), T(G(S)) }
hg log -r destination( G(S) ) # { T(G(S)) }
The implementation differences between the three different copy commands (see
the origin() predicate) are not intentionally exposed, however if the
transplant was a graft instead:
hg log -r destination( G(S) ) # {}
because the 'extra' field in G(G(S)) is S, not G(S). The implementation cannot
correct this by following sources before G(S) and then select the csets that
reference those sources because the cset provided to the predicate would also
end up selected. If there were more than two copies, sources of the argument
would also get selected.
Note that the convert extension does not currently update the 'extra' map in its
destination csets, and therefore copies made prior to the convert will be
missing from the resulting set.
Instead of the loop over 'subset', the following almost works, but does not
select a transplant of a transplant. That is, 'destination(S)' will only
select T(S).
dests = set([r for r in subset if _getrevsource(repo, r) in args])
2012-07-07 08:47:55 +04:00
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 21:7e61b508e709
|
|
|
|
branch: dev
|
|
|
|
tag: tip
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
Transplants of grafts can find a destination...
|
|
|
|
$ hg log -r 'destination(7)'
|
|
|
|
changeset: 21:7e61b508e709
|
|
|
|
branch: dev
|
|
|
|
tag: tip
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
... grafts of grafts unfortunately can't
|
|
|
|
$ hg graft -q 13
|
|
|
|
$ hg log -r 'destination(13)'
|
|
|
|
All copies of a cset
|
|
|
|
$ hg log -r 'origin(13) or destination(origin(13))'
|
|
|
|
changeset: 2:5c095ad7e90f
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 7:ef0ef43d49e7
|
|
|
|
parent: 0:68795b066622
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 13:9db0f28fd374
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
2014-12-04 02:03:29 +03:00
|
|
|
changeset: 19:9627f653b421
|
revset: add destination() predicate
This predicate is used to find csets that were created because of a graft,
transplant or rebase --keep. An optional revset can be supplied, in which case
the result will be limited to those copies which specified one of the revs as
the source for the command.
hg log -r destination() # csets copied from anywhere
hg log -r destination(branch(default)) # all csets copied from default
hg log -r origin(x) or destination(origin(x)) # all instances of x
This predicate will follow a cset through different types of copies. Given a
repo with a cset 'S' that is grafted to create G(S), which itself is
transplanted to become T(G(S)):
o-S
/
o-o-G(S)
\
o-T(G(S))
hg log -r destination( S ) # { G(S), T(G(S)) }
hg log -r destination( G(S) ) # { T(G(S)) }
The implementation differences between the three different copy commands (see
the origin() predicate) are not intentionally exposed, however if the
transplant was a graft instead:
hg log -r destination( G(S) ) # {}
because the 'extra' field in G(G(S)) is S, not G(S). The implementation cannot
correct this by following sources before G(S) and then select the csets that
reference those sources because the cset provided to the predicate would also
end up selected. If there were more than two copies, sources of the argument
would also get selected.
Note that the convert extension does not currently update the 'extra' map in its
destination csets, and therefore copies made prior to the convert will be
missing from the resulting set.
Instead of the loop over 'subset', the following almost works, but does not
select a transplant of a transplant. That is, 'destination(S)' will only
select T(S).
dests = set([r for r in subset if _getrevsource(repo, r) in args])
2012-07-07 08:47:55 +04:00
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 21:7e61b508e709
|
|
|
|
branch: dev
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 22:1313d0a825e2
|
|
|
|
branch: dev
|
|
|
|
tag: tip
|
|
|
|
user: foo
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: 2
|
|
|
|
|
2014-04-29 04:25:36 +04:00
|
|
|
|
|
|
|
graft works on complex revset
|
|
|
|
|
|
|
|
$ hg graft 'origin(13) or destination(origin(13))'
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping ancestor revision 21:7e61b508e709
|
|
|
|
skipping ancestor revision 22:1313d0a825e2
|
|
|
|
skipping revision 2:5c095ad7e90f (already grafted to 22:1313d0a825e2)
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 7:ef0ef43d49e7 "2"
|
|
|
|
grafting 13:9db0f28fd374 "2"
|
|
|
|
grafting 19:9627f653b421 "2"
|
2014-04-29 04:25:36 +04:00
|
|
|
merging b
|
2014-07-26 05:21:16 +04:00
|
|
|
|
|
|
|
graft with --force (still doesn't graft merges)
|
|
|
|
|
|
|
|
$ hg graft 19 0 6
|
|
|
|
skipping ungraftable merge revision 6
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping ancestor revision 0:68795b066622
|
|
|
|
skipping already grafted revision 19:9627f653b421 (22:1313d0a825e2 also has origin 2:5c095ad7e90f)
|
2014-07-26 05:21:16 +04:00
|
|
|
[255]
|
|
|
|
$ hg graft 19 0 6 --force
|
|
|
|
skipping ungraftable merge revision 6
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 19:9627f653b421 "2"
|
2014-07-26 05:21:16 +04:00
|
|
|
merging b
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 0:68795b066622 "0"
|
2014-07-26 05:21:16 +04:00
|
|
|
|
|
|
|
graft --force after backout
|
|
|
|
|
|
|
|
$ echo abc > a
|
|
|
|
$ hg ci -m 28
|
|
|
|
$ hg backout 28
|
|
|
|
reverting a
|
|
|
|
changeset 29:484c03b8dfa4 backs out changeset 28:6c56f0f7f033
|
|
|
|
$ hg graft 28
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping ancestor revision 28:6c56f0f7f033
|
2014-07-26 05:21:16 +04:00
|
|
|
[255]
|
|
|
|
$ hg graft 28 --force
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 28:6c56f0f7f033 "28"
|
2014-07-26 05:21:16 +04:00
|
|
|
merging a
|
|
|
|
$ cat a
|
|
|
|
abc
|
|
|
|
|
2014-07-27 01:54:36 +04:00
|
|
|
graft --continue after --force
|
|
|
|
|
2014-12-04 02:03:29 +03:00
|
|
|
$ echo def > a
|
|
|
|
$ hg ci -m 31
|
2014-07-27 01:54:36 +04:00
|
|
|
$ hg graft 28 --force --tool internal:fail
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 28:6c56f0f7f033 "28"
|
2014-07-27 01:54:36 +04:00
|
|
|
abort: unresolved conflicts, can't continue
|
|
|
|
(use hg resolve and hg graft --continue)
|
|
|
|
[255]
|
|
|
|
$ hg resolve --all
|
|
|
|
merging a
|
2014-12-04 02:03:29 +03:00
|
|
|
warning: conflicts during merge.
|
|
|
|
merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
|
|
|
|
[1]
|
|
|
|
$ echo abc > a
|
|
|
|
$ hg resolve -m a
|
2014-07-27 01:54:36 +04:00
|
|
|
(no more unresolved files)
|
|
|
|
$ hg graft -c
|
2014-12-09 05:38:23 +03:00
|
|
|
grafting 28:6c56f0f7f033 "28"
|
2014-07-27 01:54:36 +04:00
|
|
|
$ cat a
|
|
|
|
abc
|
2014-08-27 17:30:09 +04:00
|
|
|
|
|
|
|
Continue testing same origin policy, using revision numbers from test above
|
|
|
|
but do some destructive editing of the repo:
|
|
|
|
|
|
|
|
$ hg up -qC 7
|
|
|
|
$ hg tag -l -r 13 tmp
|
2014-12-09 22:45:12 +03:00
|
|
|
$ hg --config extensions.strip= strip 2
|
2014-08-27 17:30:09 +04:00
|
|
|
saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-backup.hg (glob)
|
|
|
|
$ hg graft tmp
|
2014-12-09 05:38:23 +03:00
|
|
|
skipping already grafted revision 8:9db0f28fd374 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f)
|
2014-08-27 17:30:09 +04:00
|
|
|
[255]
|
2014-12-09 05:37:55 +03:00
|
|
|
|
|
|
|
Empty graft
|
|
|
|
|
|
|
|
$ hg up -qr 26
|
|
|
|
$ hg tag -f something
|
|
|
|
$ hg graft -qr 27
|
2014-12-09 21:39:23 +03:00
|
|
|
$ hg graft -f 27
|
|
|
|
grafting 27:3aaa8b6725f0 "28"
|
|
|
|
note: graft of 27:3aaa8b6725f0 created no changes to commit
|