Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
evolve
Commits
a73cdef2e33f
Commit
a73cdef2
authored
May 08, 2020
by
Pierre-Yves David
🐙
Browse files
evolve: rename `evolve_source_*` to `divergence_source_*`
This makes it clearer that this comes from divergence resolution.
parent
142827ad86f3
Pipeline
#5788
passed with stage
in 5 minutes and 35 seconds
Changes
14
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
hgext3rd/evolve/evolvecmd.py
View file @
a73cdef2
...
...
@@ -688,8 +688,8 @@
{(
b
'ui'
,
b
'allowemptycommit'
):
b
'true'
},
b
'evolve'
):
extra
=
{
b
'
evolv
e_source_local'
:
divergent
.
hex
(),
b
'
evolv
e_source_other'
:
other
.
hex
()
b
'
divergenc
e_source_local'
:
divergent
.
hex
(),
b
'
divergenc
e_source_other'
:
other
.
hex
()
}
newnode
=
repo
.
commit
(
text
=
desc
,
user
=
user
,
date
=
date
,
extra
=
extra
)
new
=
repo
[
newnode
]
...
...
hgext3rd/evolve/obshistory.py
View file @
a73cdef2
...
...
@@ -49,8 +49,8 @@
@
eh
.
extsetup
def
addtouchnoise
(
ui
):
obsutil
.
METABLACKLIST
.
append
(
re
.
compile
(
br
'^__touch-noise__$'
))
obsutil
.
METABLACKLIST
.
append
(
re
.
compile
(
br
'^
evolv
e_source_local$'
))
obsutil
.
METABLACKLIST
.
append
(
re
.
compile
(
br
'^
evolv
e_source_other$'
))
obsutil
.
METABLACKLIST
.
append
(
re
.
compile
(
br
'^
divergenc
e_source_local$'
))
obsutil
.
METABLACKLIST
.
append
(
re
.
compile
(
br
'^
divergenc
e_source_other$'
))
@
eh
.
command
(
b
'obslog|olog'
,
...
...
tests/test-evolve-content-divergent-basic.t
View file @
a73cdef2
...
...
@@ -142,5 +142,5 @@
with: [3] divergent
base: [1] added b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at
cfcd9a3d058
8
working directory is now at
98a
b969ac8fb
$
hg
log
-
G
...
...
@@ -146,5 +146,5 @@
$
hg
log
-
G
@
4
:
cfcd9a3d0588
@default
(
draft
)
divergent
[]
@
4
:
98
ab969ac8fb
@default
(
draft
)
divergent
[]
|
o
0
:
9092
f1db7931@default
(
draft
)
added
a
[]
...
...
@@ -153,7 +153,7 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID
cfcd9a3d0588dd3abd278373246f2bdd6a646647
# Node ID
98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242
# Parent 9092f1db7931481f93b37d5c9fbcfc341bcd7318
divergent
...
...
@@ -240,6 +240,6 @@
0
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
content
divergent
changesets
on
different
branches
.
choose
branch
for
the
resolution
changeset
.
(
a
)
default
or
(
b
)
watwat
or
(
c
)
foobar
?
c
working
directory
is
now
at
f7d7ae0f2678
working
directory
is
now
at
15
ee7f765bf7
$
hg
glog
...
...
@@ -244,6 +244,6 @@
$
hg
glog
@
7
:
f7d7ae0f2678
added
d
@
7
:
15
ee7f765bf7
added
d
|
()
[
foobar
]
draft
o
3
:
ca1b80f7960a
added
c
|
()
[
default
]
draft
...
...
@@ -276,7 +276,7 @@
$ hg glog
@ 9:59081c9c425a added a d with bar in it, expect some beers
| () [default] draft
| * 8:
41db48ee7fab
added d
| * 8:
e6f07f2f33a9
added d
|/ () [foobar] draft
o 3:ca1b80f7960a added c
| () [default] draft
...
...
@@ -292,6 +292,6 @@
with: [8] added d
base: [7] added d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at
687b947d0a60
working directory is now at
34e78e1673c1
$ hg glog
...
...
@@ -296,6 +296,6 @@
$ hg glog
@ 10:
687b947d0a60
added a d with bar in it, expect some beers
@ 10:
34e78e1673c1
added a d with bar in it, expect some beers
| () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
...
...
@@ -313,12 +313,12 @@
$ hg up 'predecessors(.)' --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset
687b947d0a60
(hidden revision '
687b947d0a60
' was rewritten as:
7b36e4bdcf1b
)
working directory parent is obsolete! (
687b947d0a60
)
(use 'hg evolve' to update to its successor:
7b36e4bdcf1b
)
updated to hidden changeset
34e78e1673c1
(hidden revision '
34e78e1673c1
' was rewritten as:
c9d0d72972b0
)
working directory parent is obsolete! (
34e78e1673c1
)
(use 'hg evolve' to update to its successor:
c9d0d72972b0
)
$ echo babar > d
$ hg amend -m "foo to d"
2 new content-divergent changesets
$ hg glog
...
...
@@ -320,7 +320,7 @@
$ echo babar > d
$ hg amend -m "foo to d"
2 new content-divergent changesets
$ hg glog
@ 12:
9de05413bc4d
foo to d
@ 12:
b4dadb3b47a7
foo to d
| () [default] draft
...
...
@@ -326,5 +326,5 @@
| () [default] draft
| * 11:
7b36e4bdcf1b
foo to d
| * 11:
c9d0d72972b0
foo to d
|/ () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
...
...
@@ -351,6 +351,6 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
working directory is now at
348265c659d9
working directory is now at
cfd599de811a
$ hg glog
...
...
@@ -355,6 +355,6 @@
$ hg glog
@ 13:
348265c659d9
foo to d
@ 13:
cfd599de811a
foo to d
| () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
...
...
@@ -373,12 +373,12 @@
$ hg up
'
predecessors
(
.
)'
--hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset
348265c659d9
(hidden revision
'
348265
c659d9
'
was rewritten as:
e0633eb64c66
)
working directory parent is obsolete! (
348265c659d9
)
(use
'
hg
evolve
'
to update to its successor:
e0633eb64c66
)
updated to hidden changeset
cfd599de811a
(hidden revision
'
cfd599de811a
'
was rewritten as:
ba0941ffb747
)
working directory parent is obsolete! (
cfd599de811a
)
(use
'
hg
evolve
'
to update to its successor:
ba0941ffb747
)
$ echo wat > d
$ hg amend -m "wat to d, wat?"
2 new content-divergent changesets
$ hg glog
...
...
@@ -380,7 +380,7 @@
$ echo wat > d
$ hg amend -m "wat to d, wat?"
2 new content-divergent changesets
$ hg glog
@ 15:
3eec13f9b72e
wat to d, wat?
@ 15:
4127dd63df67
wat to d, wat?
| () [default] draft
...
...
@@ -386,5 +386,5 @@
| () [default] draft
| * 14:
e0633eb64c66
bar to d, expect beers
| * 14:
ba0941ffb747
bar to d, expect beers
|/ () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
...
...
@@ -434,6 +434,6 @@
**done showing editors text**
working directory is now at
39483e49e3bb
working directory is now at
b4c8664fa327
$ hg glog
...
...
@@ -438,6 +438,6 @@
$ hg glog
@ 16:
39483e49e3bb
watbar to d
@ 16:
b4c8664fa327
watbar to d
| () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
...
...
@@ -533,6 +533,6 @@
a
committing manifest
committing changelog
working directory is now at
b4deda8116ef
working directory is now at
6aa6f90a9f68
$ hg st
$ glog
...
...
@@ -537,7 +537,7 @@
$ hg st
$ glog
@ 4:
b4deda8116ef
@default(draft) bk:[] More addition
@ 4:
6aa6f90a9f68
@default(draft) bk:[] More addition
|
o 0:6569b5a81c7e@default(public) bk:[] root
$ hg summary
...
...
@@ -540,8 +540,8 @@
|
o 0:6569b5a81c7e@default(public) bk:[] root
$ hg summary
parent: 4:
b4deda8116ef
tip
parent: 4:
6aa6f90a9f68
tip
More addition
branch: default
commit: (clean)
...
...
@@ -552,7 +552,7 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID
b4deda8116effeb6eeabd0a14f40cc8b21ca1b37
# Node ID
6aa6f90a9f684b8a4b698234e25c5dad7328b199
# Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd
More addition
...
...
@@ -577,5 +577,5 @@
$ hg up --hidden
'
min
(
desc
("
More addition
"))'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to hidden changeset 867e43582046
(hidden revision
'
867e43582046
'
was rewritten as:
b4deda8116ef
)
(hidden revision
'
867e43582046
'
was rewritten as:
6aa6f90a9f68
)
working directory parent is obsolete! (867e43582046)
...
...
@@ -581,5 +581,5 @@
working directory parent is obsolete! (867e43582046)
(use
'
hg
evolve
'
to update to its successor:
b4deda8116ef
)
(use
'
hg
evolve
'
to update to its successor:
6aa6f90a9f68
)
$ echo
'
gotta
break
'
>> a
$ hg amend
2 new content-divergent changesets
...
...
@@ -594,10 +594,10 @@
$ glog
@ 6:13c1b75640a1@default(draft) bk:[] More addition (2)
|
| * 4:
b4deda8116ef
@default(draft) bk:[] More addition
| * 4:
6aa6f90a9f68
@default(draft) bk:[] More addition
|/
o 0:6569b5a81c7e@default(public) bk:[] root
$ hg evolve -qn --content-divergent --no-all
hg update -c 13c1b75640a1 &&
...
...
@@ -598,11 +598,11 @@
|/
o 0:6569b5a81c7e@default(public) bk:[] root
$ hg evolve -qn --content-divergent --no-all
hg update -c 13c1b75640a1 &&
hg merge
b4deda8116ef
&&
hg commit -m "auto merge resolving conflict between 13c1b75640a1 and
b4deda8116ef
"&&
hg merge
6aa6f90a9f68
&&
hg commit -m "auto merge resolving conflict between 13c1b75640a1 and
6aa6f90a9f68
"&&
hg up -C 867e43582046 &&
hg revert --all --rev tip &&
hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`";
...
...
@@ -633,5 +633,5 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
working directory is now at
4a175c20d152
working directory is now at
22dc0f618f0d
$ glog
...
...
@@ -637,5 +637,5 @@
$ glog
@ 7:
4a175c20d152
@default(draft) bk:[] More addition (2)
@ 7:
22dc0f618f0d
@default(draft) bk:[] More addition (2)
|
o 0:6569b5a81c7e@default(public) bk:[] root
...
...
@@ -644,7 +644,7 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID
4a175c20d152f8f4266a3b85a5dcf74b5a032719
# Node ID
22dc0f618f0d8714c611e7a683ad229a575f167c
# Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd
More addition (2)
...
...
@@ -964,7 +964,7 @@
merging numbers
merging romans
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
working directory is now at
ce0aaa423a89
working directory is now at
e7cb08a7241a
$ hg status
$ hg amend -m
'
E4
'
$ hg export
...
...
@@ -972,7 +972,7 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
# Node ID
b8e4a5a633b6fb38bbc9011601b3342573733083
# Node ID
50bb00cad3206c79d231a621e319772302a88d8d
# Parent 6d1fdf6de7e2d9fc9b098aa286b60785bbeaab7a
E4
...
...
@@ -995,10 +995,10 @@
-VI
+vi
$ hg log -G
@ 5:
b8e4a5a633b6
@default(draft) E4 []
@ 5:
50bb00cad320
@default(draft) E4 []
|
o 0:6d1fdf6de7e2@default(draft) root []
$ hg debugobsolete
4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
9
'
,
'
operation
'
:
'
amend
'
,
'
user
'
:
'
test
'
}
4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
9
'
,
'
operation
'
:
'
amend
'
,
'
user
'
:
'
test
'
}
...
...
@@ -999,10 +999,10 @@
|
o 0:6d1fdf6de7e2@default(draft) root []
$ hg debugobsolete
4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
9
'
,
'
operation
'
:
'
amend
'
,
'
user
'
:
'
test
'
}
4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
9
'
,
'
operation
'
:
'
amend
'
,
'
user
'
:
'
test
'
}
084ae625fa51ca8c441ba1d2bf0f974b21671017
ce0aaa423a89436c9a9b320283dc0cc89f04a91d
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
9
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
19ed1bf64a2cc2a824df5ac33a436eca1ae0475d
ce0aaa423a89436c9a9b320283dc0cc89f04a91d
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
9
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
ce0aaa423a89436c9a9b320283dc0cc89f04a91d b8e4a5a633b6fb38bbc9011601b3342573733083
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
1
'
,
'
operation
'
:
'
amend
'
,
'
user
'
:
'
test
'
}
084ae625fa51ca8c441ba1d2bf0f974b21671017
e7cb08a7241a98c908db298b61fc033b27f648c7
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
9
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
19ed1bf64a2cc2a824df5ac33a436eca1ae0475d
e7cb08a7241a98c908db298b61fc033b27f648c7
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
9
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
e7cb08a7241a98c908db298b61fc033b27f648c7 50bb00cad3206c79d231a621e319772302a88d8d
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
1
'
,
'
operation
'
:
'
amend
'
,
'
user
'
:
'
test
'
}
$ hg obslog --patch
...
...
@@ -1008,3 +1008,3 @@
$ hg obslog --patch
@
b8e4a5a633b6
(5) E4
@
50bb00cad320
(5) E4
|
...
...
@@ -1010,7 +1010,7 @@
|
x
ce0aaa423a89
(4) <<<<<<< divergent
|\ reworded(description) as
b8e4a5a633b6
using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r
ce0aaa423a89 -r b8e4a5a633b6
changeset-description
x
e7cb08a7241a
(4) <<<<<<< divergent
|\ reworded(description) as
50bb00cad320
using amend by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r
e7cb08a7241a -r 50bb00cad320
changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,4 +1,1 @@
...
...
@@ -1022,8 +1022,8 @@
| |
| |
x | 084ae625fa51 (2) E2
| | rewritten(description, content) as
ce0aaa423a89
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r 084ae625fa51 -r
ce0aaa423a89
changeset-description
| | rewritten(description, content) as
e7cb08a7241a
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | diff -r 084ae625fa51 -r
e7cb08a7241a
changeset-description
| | --- a/changeset-description
| | +++ b/changeset-description
| | @@ -1,1 +1,4 @@
...
...
@@ -1054,8 +1054,8 @@
| |
| |
| x 19ed1bf64a2c (3) E3
|/ rewritten(description, content) as
ce0aaa423a89
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 19ed1bf64a2c -r
ce0aaa423a89
changeset-description
|/ rewritten(description, content) as
e7cb08a7241a
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 19ed1bf64a2c -r
e7cb08a7241a
changeset-description
| --- a/changeset-description
| +++ b/changeset-description
| @@ -1,1 +1,4 @@
...
...
tests/test-evolve-content-divergent-corner-cases.t
View file @
a73cdef2
...
...
@@ -79,5 +79,5 @@
with: [3] divergent
base: [1] added b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at
cfcd9a3d058
8
working directory is now at
98a
b969ac8fb
$
hg
log
-
G
...
...
@@ -83,8 +83,8 @@
$
hg
log
-
G
@
4
:
cfcd9a3d0588
@default
(
draft
)
divergent
[]
@
4
:
98
ab969ac8fb
@default
(
draft
)
divergent
[]
|
o
0
:
9092
f1db7931@default
(
draft
)
added
a
[]
$
hg
debugobsolete
5
f6d8a4bf34ab274ccc9f631c2536964b8a3666d
8374
d2ddc3a4d48428c3d2f80e4fc86f13736f96
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
5
f6d8a4bf34ab274ccc9f631c2536964b8a3666d
593
c57f2117e33dd0884382f02789d948f548557
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
...
...
@@ -85,9 +85,9 @@
|
o
0
:
9092
f1db7931@default
(
draft
)
added
a
[]
$
hg
debugobsolete
5
f6d8a4bf34ab274ccc9f631c2536964b8a3666d
8374
d2ddc3a4d48428c3d2f80e4fc86f13736f96
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
5
f6d8a4bf34ab274ccc9f631c2536964b8a3666d
593
c57f2117e33dd0884382f02789d948f548557
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
593
c57f2117e33dd0884382f02789d948f548557
cfcd9a3d0588dd3abd278373246f2bdd6a646647
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
8374
d2ddc3a4d48428c3d2f80e4fc86f13736f96
cfcd9a3d0588dd3abd278373246f2bdd6a646647
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
593
c57f2117e33dd0884382f02789d948f548557
98
ab969ac8fbe315e6d2c24a8eb5eab5b81e4242
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
8374
d2ddc3a4d48428c3d2f80e4fc86f13736f96
98
ab969ac8fbe315e6d2c24a8eb5eab5b81e4242
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
$
hg
obslog
--
all
...
...
@@ -93,4 +93,4 @@
$
hg
obslog
--
all
@
cfcd9a3d0588
(
4
)
divergent
@
98
ab969ac8fb
(
4
)
divergent
|\
x
|
593
c57f2117e
(
2
)
divergent
...
...
@@ -95,5 +95,5 @@
|\
x
|
593
c57f2117e
(
2
)
divergent
|
|
amended
(
content
)
as
cfcd9a3d0588
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|
|
amended
(
content
)
as
98
ab969ac8fb
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|
|
|
x
8374
d2ddc3a4
(
3
)
divergent
...
...
@@ -98,6 +98,6 @@
|
|
|
x
8374
d2ddc3a4
(
3
)
divergent
|/
amended
(
content
)
as
cfcd9a3d0588
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|/
amended
(
content
)
as
98
ab969ac8fb
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|
x
5
f6d8a4bf34a
(
1
)
added
b
rewritten
(
description
,
content
)
as
593
c57f2117e
using
prune
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
...
...
@@ -132,7 +132,7 @@
|/
|
o
5
:
48819
a835615@default
(
draft
)
add
_c
[]
|/
|
o
4
:
cfcd9a3d0588
@default
(
draft
)
divergent
[]
|
o
4
:
98
ab969ac8fb
@default
(
draft
)
divergent
[]
|/
o
0
:
9092
f1db7931@default
(
draft
)
added
a
[]
...
...
@@ -148,7 +148,7 @@
|
| * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]
|/
| o 4:
cfcd9a3d0588
@default(draft) divergent []
| o 4:
98ab
969
ac8fb
@default
(
draft
)
divergent
[]
|/
o
0
:
9092
f1db7931@default
(
draft
)
added
a
[]
...
...
@@ -157,6 +157,6 @@
with:
[
7
]
add
_c
base:
[
5
]
add
_c
0
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
working
directory
is
now
at
c7cbb2f2c5ac
working
directory
is
now
at
6
b3776664a25
$
hg
log
-
G
...
...
@@ -161,4 +161,4 @@
$
hg
log
-
G
@
8
:
c7cbb2f2c5ac
@default
(
draft
)
add
cdivergent1
[]
@
8
:
6
b3776664a25
@default
(
draft
)
add
cdivergent1
[]
|
...
...
@@ -164,8 +164,8 @@
|
|
o
4
:
cfcd9a3d0588
@default
(
draft
)
divergent
[]
|
o
4
:
98
ab969ac8fb
@default
(
draft
)
divergent
[]
|/
o
0
:
9092
f1db7931@default
(
draft
)
added
a
[]
$
hg
debugobsolete
5
f6d8a4bf34ab274ccc9f631c2536964b8a3666d
8374
d2ddc3a4d48428c3d2f80e4fc86f13736f96
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
5
f6d8a4bf34ab274ccc9f631c2536964b8a3666d
593
c57f2117e33dd0884382f02789d948f548557
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
...
...
@@ -166,10 +166,10 @@
|/
o
0
:
9092
f1db7931@default
(
draft
)
added
a
[]
$
hg
debugobsolete
5
f6d8a4bf34ab274ccc9f631c2536964b8a3666d
8374
d2ddc3a4d48428c3d2f80e4fc86f13736f96
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
5
f6d8a4bf34ab274ccc9f631c2536964b8a3666d
593
c57f2117e33dd0884382f02789d948f548557
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
593
c57f2117e33dd0884382f02789d948f548557
cfcd9a3d0588dd3abd278373246f2bdd6a646647
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
8374
d2ddc3a4d48428c3d2f80e4fc86f13736f96
cfcd9a3d0588dd3abd278373246f2bdd6a646647
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
593
c57f2117e33dd0884382f02789d948f548557
98
ab969ac8fbe315e6d2c24a8eb5eab5b81e4242
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
8374
d2ddc3a4d48428c3d2f80e4fc86f13736f96
98
ab969ac8fbe315e6d2c24a8eb5eab5b81e4242
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
48819
a83561596ef0aeac4082eaaa8afe4320f3a
b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
48819
a83561596ef0aeac4082eaaa8afe4320f3a
e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
...
...
@@ -174,5 +174,5 @@
48819
a83561596ef0aeac4082eaaa8afe4320f3a
b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
48819
a83561596ef0aeac4082eaaa8afe4320f3a
e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3
c7cbb2f2c5ac9b4f3433a08a51527d6544d79096
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
0
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49
c7cbb2f2c5ac9b4f3433a08a51527d6544d79096
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
1
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
e3ff64ce8d4ce33b40d9f367a8ec472fec588ca3
6
b3776664a258aa4c7e13f90df20ae9170995217
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
0
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
b2ae71172042972a8e8d2bc11e2b2fe4e0c3aa49
6
b3776664a258aa4c7e13f90df20ae9170995217
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
1
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
$
hg
obslog
--
all
...
...
@@ -178,4 +178,4 @@
$
hg
obslog
--
all
@
c7cbb2f2c5ac
(
8
)
add
cdivergent1
@
6
b3776664a25
(
8
)
add
cdivergent1
|\
x
|
b2ae71172042
(
7
)
add
_c
...
...
@@ -180,5 +180,5 @@
|\
x
|
b2ae71172042
(
7
)
add
_c
|
|
reworded
(
description
)
as
c7cbb2f2c5ac
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|
|
reworded
(
description
)
as
6
b3776664a25
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|
|
|
x
e3ff64ce8d4c
(
6
)
add
cdivergent1
...
...
@@ -183,6 +183,6 @@
|
|
|
x
e3ff64ce8d4c
(
6
)
add
cdivergent1
|/
rewritten
as
c7cbb2f2c5ac
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|/
rewritten
as
6
b3776664a25
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|
x
48819
a835615
(
5
)
add
_c
amended
(
content
)
as
b2ae71172042
using
prune
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
...
...
@@ -254,6 +254,6 @@
with:
[
3
]
bdivergent
base:
[
1
]
add
_b
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
working
directory
is
now
at
e9189d547f9f
working
directory
is
now
at
b87e0354d5cb
$
hg
log
-
G
...
...
@@ -258,9 +258,9 @@
$
hg
log
-
G
@
4
:
e9189d547f9f
@default
(
draft
)
bdivergent
[]
@
4
:
b87e0354d5cb
@default
(
draft
)
bdivergent
[]
|
o
0
:
135
f39f4bd78@default
(
draft
)
add
_a
[]
$
hg
debugobsolete
37445
b16603b50165d5eb80735fb986c72a2dac1
6
b096fb450709a194b21fb9b192fe9b1572c4af0
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
37445
b16603b50165d5eb80735fb986c72a2dac1
05
a6b6a9e633802d2bdd06e6d292982a767d930e
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
...
...
@@ -261,9 +261,9 @@
|
o
0
:
135
f39f4bd78@default
(
draft
)
add
_a
[]
$
hg
debugobsolete
37445
b16603b50165d5eb80735fb986c72a2dac1
6
b096fb450709a194b21fb9b192fe9b1572c4af0
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
37445
b16603b50165d5eb80735fb986c72a2dac1
05
a6b6a9e633802d2bdd06e6d292982a767d930e
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
9
',
'
operation
':
'
prune
',
'
user
':
'
test
'}
05
a6b6a9e633802d2bdd06e6d292982a767d930e
e9189d547f9f578af31ea4ff8be2ba3a8bd95e7a
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
6
b096fb450709a194b21fb9b192fe9b1572c4af0
e9189d547f9f578af31ea4ff8be2ba3a8bd95e7a
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
05
a6b6a9e633802d2bdd06e6d292982a767d930e
b87e0354d5cb081210298429d8b51de9871155a2
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
6
b096fb450709a194b21fb9b192fe9b1572c4af0
b87e0354d5cb081210298429d8b51de9871155a2
0
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
{'
ef1
':
'
8
',
'
operation
':
'
evolve
',
'
user
':
'
test
'}
$
hg
obslog
--
all
...
...
@@ -269,4 +269,4 @@
$
hg
obslog
--
all
@
e9189d547f9f
(
4
)
bdivergent
@
b87e0354d5cb
(
4
)
bdivergent
|\
x
|
05
a6b6a9e633
(
2
)
bdivergent
...
...
@@ -271,5 +271,5 @@
|\
x
|
05
a6b6a9e633
(
2
)
bdivergent
|
|
amended
(
content
)
as
e9189d547f9f
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|
|
amended
(
content
)
as
b87e0354d5cb
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|
|
|
x
6
b096fb45070
(
3
)
bdivergent
...
...
@@ -274,6 +274,6 @@
|
|
|
x
6
b096fb45070
(
3
)
bdivergent
|/
amended
(
content
)
as
e9189d547f9f
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|/
amended
(
content
)
as
b87e0354d5cb
using
evolve
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
|
x
37445
b16603b
(
1
)
add
_b
rewritten
(
description
,
content
)
as
05
a6b6a9e633
using
prune
by
test
(
Thu
Jan
01
00
:
00
:
00
1970
+
0000
)
...
...
@@ -356,6 +356,6 @@
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? c
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
working directory is now at 5
deaa504a865
working directory is now at 5
1ee71efed61
$ hg glog -l1
...
...
@@ -360,6 +360,6 @@
$ hg glog -l1
@ 9:5
deaa504a865
updated e
@ 9:5
1ee71efed61
updated e
| () [default] draft
~
...
...
@@ -369,6 +369,6 @@
9150fe93bec603cd88d05cda9f6ff13420cb53e9 0 {155349b645beebee15325a9a22dd0c9ef8fbbbd3} (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
0
'
,
'
operation
'
:
'
prune
'
,
'
user
'
:
'
test
'
}
ff6f7cd76a7c97d938e8fe87f0fc816b66929435 0ceb21ca2557a61433f097e4d64024e37cae2c10 0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
4
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
de4ea3103326293994c634101e780724346ee89f a2465d1d56d1aee8ed90d2292978456d2be6f7b9 0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
4
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
0ceb21ca2557a61433f097e4d64024e37cae2c10 5
deaa504a865ac3f3fe772c50a583a427aa76449
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
8
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
a2465d1d56d1aee8ed90d2292978456d2be6f7b9 5
deaa504a865ac3f3fe772c50a583a427aa76449
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
0
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
0ceb21ca2557a61433f097e4d64024e37cae2c10 5
1ee71efed6170064a7155a9a35e56af0292a203
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
8
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
a2465d1d56d1aee8ed90d2292978456d2be6f7b9 5
1ee71efed6170064a7155a9a35e56af0292a203
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
0
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
$ hg obslog --all
...
...
@@ -374,4 +374,4 @@
$ hg obslog --all
@ 5
deaa504a865
(9) updated e
@ 5
1ee71efed61
(9) updated e
|\
x | 0ceb21ca2557 (7) updated e
...
...
@@ -376,5 +376,5 @@
|\
x | 0ceb21ca2557 (7) updated e
| | amended(content) as 5
deaa504a865
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | amended(content) as 5
1ee71efed61
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x a2465d1d56d1 (8) updated e
...
...
@@ -379,6 +379,6 @@
| |
| x a2465d1d56d1 (8) updated e
| | rewritten as 5
deaa504a865
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | rewritten as 5
1ee71efed61
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x de4ea3103326 (6) updated e
| | rebased(parent) as a2465d1d56d1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
...
...
@@ -441,5 +441,5 @@
with: [3] delete a
base: [1] delete a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at
48942a623d38
working directory is now at
b1badc7ab394
$ hg glog
...
...
@@ -445,5 +445,5 @@
$ hg glog
@ 4:
48942a623d38
delete a
@ 4:
b1badc7ab394
delete a
| () [default] draft
o 0:75d2b02c4a5c initial
() [default] draft
...
...
@@ -459,6 +459,6 @@
$ hg debugobsolete
dff6e52f5e419381c070159c8038ac948f59283f 0825dcee2670349e749f1df45857fca34f61e350 0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
8
'
,
'
operation
'
:
'
amend
'
,
'
user
'
:
'
test
'
}
dff6e52f5e419381c070159c8038ac948f59283f 92ecd58f9b05d6c0a1c3833a79359eea4b0268ff 0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
8
'
,
'
operation
'
:
'
amend
'
,
'
user
'
:
'
test
'
}
0825dcee2670349e749f1df45857fca34f61e350
48942a623d383b1ff275f1194ead88d2e697b18b
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
8
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
92ecd58f9b05d6c0a1c3833a79359eea4b0268ff
48942a623d383b1ff275f1194ead88d2e697b18b
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
8
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
0825dcee2670349e749f1df45857fca34f61e350
b1badc7ab394c2b9ed21e2961de43c71c2e2288f
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
8
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
92ecd58f9b05d6c0a1c3833a79359eea4b0268ff
b1badc7ab394c2b9ed21e2961de43c71c2e2288f
0 (Thu Jan 01 00:00:00 1970 +0000) {
'
ef1
'
:
'
8
'
,
'
operation
'
:
'
evolve
'
,
'
user
'
:
'
test
'
}
$ hg obslog --all
...
...
@@ -464,4 +464,4 @@
$ hg obslog --all
@
48942a623d38
(4) delete a
@
b1badc7ab394
(4) delete a
|\
x | 0825dcee2670 (2) delete a
...
...
@@ -466,5 +466,5 @@
|\
x | 0825dcee2670 (2) delete a
| | amended(content) as
48942a623d38
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| | amended(content) as
b1badc7ab394
using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
| |
<