2010-09-26 22:43:21 +04:00
|
|
|
test merge-tools configuration - mostly exercising filemerge.py
|
|
|
|
|
|
|
|
|
|
$ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
|
|
|
|
|
$ hg init
|
|
|
|
|
|
|
|
|
|
revision 0
|
|
|
|
|
|
|
|
|
|
$ echo "revision 0" > f
|
|
|
|
|
$ echo "space" >> f
|
|
|
|
|
$ hg commit -Am "revision 0"
|
|
|
|
|
adding f
|
|
|
|
|
|
|
|
|
|
revision 1
|
|
|
|
|
|
|
|
|
|
$ echo "revision 1" > f
|
|
|
|
|
$ echo "space" >> f
|
|
|
|
|
$ hg commit -Am "revision 1"
|
|
|
|
|
$ hg update 0 > /dev/null
|
|
|
|
|
|
|
|
|
|
revision 2
|
|
|
|
|
|
|
|
|
|
$ echo "revision 2" > f
|
|
|
|
|
$ echo "space" >> f
|
|
|
|
|
$ hg commit -Am "revision 2"
|
|
|
|
|
created new head
|
|
|
|
|
$ hg update 0 > /dev/null
|
|
|
|
|
|
|
|
|
|
revision 3 - simple to merge
|
|
|
|
|
|
|
|
|
|
$ echo "revision 3" >> f
|
|
|
|
|
$ hg commit -Am "revision 3"
|
|
|
|
|
created new head
|
2014-08-05 03:39:47 +04:00
|
|
|
|
|
|
|
|
revision 4 - hard to merge
|
|
|
|
|
|
|
|
|
|
$ hg update 0 > /dev/null
|
|
|
|
|
$ echo "revision 4" > f
|
|
|
|
|
$ hg commit -Am "revision 4"
|
|
|
|
|
created new head
|
|
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
$ echo "[merge-tools]" > .hg/hgrc
|
2011-10-13 06:27:49 +04:00
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
$ beforemerge() {
|
|
|
|
|
> cat .hg/hgrc
|
|
|
|
|
> echo "# hg update -C 1"
|
|
|
|
|
> hg update -C 1 > /dev/null
|
|
|
|
|
> }
|
|
|
|
|
$ aftermerge() {
|
|
|
|
|
> echo "# cat f"
|
|
|
|
|
> cat f
|
|
|
|
|
> echo "# hg stat"
|
|
|
|
|
> hg stat
|
2015-11-11 04:10:47 +03:00
|
|
|
> echo "# hg resolve --list"
|
|
|
|
|
> hg resolve --list
|
2010-09-26 22:43:21 +04:00
|
|
|
> rm -f f.orig
|
|
|
|
|
> }
|
|
|
|
|
|
|
|
|
|
Tool selection
|
|
|
|
|
|
|
|
|
|
default is internal merge:
|
|
|
|
|
|
|
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
|
|
|
|
|
hg merge -r 2
|
|
|
|
|
override $PATH to ensure hgmerge not visible; use $PYTHON in case we're
|
|
|
|
|
running from a devel copy, not a temp installation
|
|
|
|
|
|
2015-09-02 23:56:04 +03:00
|
|
|
$ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
2015-10-09 23:54:52 +03:00
|
|
|
warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
|
2010-09-26 22:43:21 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
2016-11-20 02:41:37 +03:00
|
|
|
<<<<<<< working copy: ef83787e2614 - test: revision 1
|
2010-09-26 22:43:21 +04:00
|
|
|
revision 1
|
|
|
|
|
=======
|
|
|
|
|
revision 2
|
2016-11-20 02:41:37 +03:00
|
|
|
>>>>>>> merge rev: 0185f4e0cf02 - test: revision 2
|
2010-09-26 22:43:21 +04:00
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
simplest hgrc using false for merge:
|
|
|
|
|
|
|
|
|
|
$ echo "false.whatever=" >> .hg/hgrc
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
2015-04-17 23:42:20 +03:00
|
|
|
#if unix-permissions
|
|
|
|
|
|
2011-11-22 04:37:26 +04:00
|
|
|
unexecutable file in $PATH shouldn't be found:
|
|
|
|
|
|
2015-04-17 23:42:20 +03:00
|
|
|
$ echo "echo fail" > false
|
2011-11-22 04:37:26 +04:00
|
|
|
$ hg up -qC 1
|
2015-09-02 23:56:04 +03:00
|
|
|
$ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
|
2011-11-22 04:37:26 +04:00
|
|
|
merging f
|
2015-10-09 23:54:52 +03:00
|
|
|
warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
|
2011-11-22 04:37:26 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
|
|
|
[1]
|
|
|
|
|
$ rm false
|
|
|
|
|
|
2015-04-17 23:42:20 +03:00
|
|
|
#endif
|
|
|
|
|
|
2011-11-22 04:37:26 +04:00
|
|
|
executable directory in $PATH shouldn't be found:
|
|
|
|
|
|
|
|
|
|
$ mkdir false
|
|
|
|
|
$ hg up -qC 1
|
2015-09-02 23:56:04 +03:00
|
|
|
$ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2
|
2011-11-22 04:37:26 +04:00
|
|
|
merging f
|
2015-10-09 23:54:52 +03:00
|
|
|
warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
|
2011-11-22 04:37:26 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
|
|
|
[1]
|
|
|
|
|
$ rmdir false
|
|
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
true with higher .priority gets precedence:
|
|
|
|
|
|
|
|
|
|
$ echo "true.priority=1" >> .hg/hgrc
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
unless lowered on command line:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config merge-tools.true.priority=-7
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
or false set higher on command line:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config merge-tools.false.priority=117
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
2015-10-14 19:57:33 +03:00
|
|
|
or true set to disabled:
|
|
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ hg merge -r 2 --config merge-tools.true.disabled=yes
|
|
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2015-10-14 19:57:33 +03:00
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
or true.executable not found in PATH:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
# hg update -C 1
|
2012-08-18 00:58:18 +04:00
|
|
|
$ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
or true.executable with bogus path:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
# hg update -C 1
|
2012-08-18 00:58:18 +04:00
|
|
|
$ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
but true.executable set to cat found in PATH works:
|
|
|
|
|
|
|
|
|
|
$ echo "true.executable=cat" >> .hg/hgrc
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2
|
2011-02-18 05:35:01 +03:00
|
|
|
merging f
|
2010-09-26 22:43:21 +04:00
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
revision 2
|
|
|
|
|
space
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
and true.executable set to cat with path works:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config merge-tools.true.executable=cat
|
2011-02-18 05:35:01 +03:00
|
|
|
merging f
|
2010-09-26 22:43:21 +04:00
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
revision 2
|
|
|
|
|
space
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
2012-06-15 02:02:27 +04:00
|
|
|
#if unix-permissions
|
|
|
|
|
|
2011-10-13 05:45:58 +04:00
|
|
|
environment variables in true.executable are handled:
|
|
|
|
|
|
2013-06-03 00:27:08 +04:00
|
|
|
$ echo 'echo "custom merge tool"' > .hg/merge.sh
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2011-10-13 05:45:58 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 19:32:33 +04:00
|
|
|
$ hg --config merge-tools.true.executable='sh' \
|
2013-06-03 00:27:08 +04:00
|
|
|
> --config merge-tools.true.args=.hg/merge.sh \
|
2012-06-15 19:32:33 +04:00
|
|
|
> merge -r 2
|
2011-10-13 05:45:58 +04:00
|
|
|
merging f
|
|
|
|
|
custom merge tool
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2011-10-13 05:45:58 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2011-10-13 05:45:58 +04:00
|
|
|
|
2012-06-15 02:02:27 +04:00
|
|
|
#endif
|
|
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
Tool selection and merge-patterns
|
|
|
|
|
|
|
|
|
|
merge-patterns specifies new tool false:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config merge-patterns.f=false
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
merge-patterns specifies executable not found in PATH and gets warning:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-08-18 00:58:18 +04:00
|
|
|
$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool
|
2010-09-26 22:43:21 +04:00
|
|
|
couldn't find merge tool true specified for f
|
|
|
|
|
merging f
|
2015-10-12 06:47:14 +03:00
|
|
|
couldn't find merge tool true specified for f
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
merge-patterns specifies executable with bogus path and gets warning:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-08-18 00:58:18 +04:00
|
|
|
$ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool
|
2010-09-26 22:43:21 +04:00
|
|
|
couldn't find merge tool true specified for f
|
|
|
|
|
merging f
|
2015-10-12 06:47:14 +03:00
|
|
|
couldn't find merge tool true specified for f
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
ui.merge overrules priority
|
|
|
|
|
|
|
|
|
|
ui.merge specifies false:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config ui.merge=false
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
ui.merge specifies internal:fail:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config ui.merge=internal:fail
|
2010-09-26 22:43:21 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
2014-09-28 19:15:25 +04:00
|
|
|
ui.merge specifies :local (without internal prefix):
|
2010-09-26 22:43:21 +04:00
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2014-09-28 19:15:25 +04:00
|
|
|
$ hg merge -r 2 --config ui.merge=:local
|
2010-09-26 22:43:21 +04:00
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
ui.merge specifies internal:other:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config ui.merge=internal:other
|
2010-09-26 22:43:21 +04:00
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 2
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
ui.merge specifies internal:prompt:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config ui.merge=internal:prompt
|
2015-11-11 21:19:11 +03:00
|
|
|
no tool found to merge f
|
2016-10-07 18:51:50 +03:00
|
|
|
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u
|
2015-12-01 20:48:38 +03:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
|
|
|
[1]
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
2015-12-01 20:48:38 +03:00
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
2015-11-30 22:17:18 +03:00
|
|
|
ui.merge specifies :prompt, with 'leave unresolved' chosen
|
|
|
|
|
|
|
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF
|
|
|
|
|
> u
|
|
|
|
|
> EOF
|
|
|
|
|
no tool found to merge f
|
2016-10-07 18:51:50 +03:00
|
|
|
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u
|
2015-11-30 22:17:18 +03:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
|
|
|
|
|
2015-11-11 04:13:16 +03:00
|
|
|
prompt with EOF
|
|
|
|
|
|
|
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
|
2015-11-11 21:19:11 +03:00
|
|
|
no tool found to merge f
|
2016-10-07 18:51:50 +03:00
|
|
|
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved?
|
2015-11-11 04:13:16 +03:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
|
|
|
|
$ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
|
2015-11-11 21:19:11 +03:00
|
|
|
no tool found to merge f
|
2016-10-07 18:51:50 +03:00
|
|
|
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved?
|
2015-11-11 04:13:16 +03:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
|
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2015-11-11 04:16:59 +03:00
|
|
|
$ rm f
|
|
|
|
|
$ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
|
2015-11-11 21:19:11 +03:00
|
|
|
no tool found to merge f
|
2016-10-07 18:51:50 +03:00
|
|
|
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved?
|
2015-11-11 04:16:59 +03:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
|
|
|
|
$ hg resolve --all --config ui.merge=internal:prompt
|
2015-11-11 21:19:11 +03:00
|
|
|
no tool found to merge f
|
2016-10-07 18:51:50 +03:00
|
|
|
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u
|
2015-12-01 20:48:38 +03:00
|
|
|
[1]
|
2015-11-11 04:16:59 +03:00
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
|
|
|
|
# hg resolve --list
|
2015-12-01 20:48:38 +03:00
|
|
|
U f
|
2015-11-11 04:16:59 +03:00
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
ui.merge specifies internal:dump:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config ui.merge=internal:dump
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.base
|
|
|
|
|
? f.local
|
|
|
|
|
? f.orig
|
|
|
|
|
? f.other
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
f.base:
|
|
|
|
|
|
|
|
|
|
$ cat f.base
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
|
|
|
|
|
f.local:
|
|
|
|
|
|
|
|
|
|
$ cat f.local
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
|
|
|
|
|
f.other:
|
|
|
|
|
|
|
|
|
|
$ cat f.other
|
|
|
|
|
revision 2
|
|
|
|
|
space
|
|
|
|
|
$ rm f.base f.local f.other
|
|
|
|
|
|
|
|
|
|
ui.merge specifies internal:other but is overruled by pattern for false:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
Premerge
|
|
|
|
|
|
2010-10-20 07:33:52 +04:00
|
|
|
ui.merge specifies internal:other but is overruled by --tool=false
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-10-20 07:33:52 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --config ui.merge=internal:other --tool=false
|
2010-10-20 07:33:52 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-10-20 07:33:52 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2011-10-13 06:27:49 +04:00
|
|
|
|
2010-10-20 07:33:52 +04:00
|
|
|
HGMERGE specifies internal:other but is overruled by --tool=false
|
|
|
|
|
|
|
|
|
|
$ HGMERGE=internal:other ; export HGMERGE
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-10-20 07:33:52 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 2 --tool=false
|
2010-10-20 07:33:52 +04:00
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-10-20 07:33:52 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2011-10-13 06:27:49 +04:00
|
|
|
|
2010-10-20 07:33:52 +04:00
|
|
|
$ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests
|
|
|
|
|
|
2014-05-19 03:53:34 +04:00
|
|
|
update is a merge ...
|
|
|
|
|
|
context: write dirstate out explicitly after marking files as clean
To detect change of a file without redundant comparison of file
content, dirstate recognizes a file as certainly clean, if:
(1) it is already known as "normal",
(2) dirstate entry for it has valid (= not "-1") timestamp, and
(3) mode, size and timestamp of it on the filesystem are as same as
ones expected in dirstate
This works as expected in many cases, but doesn't in the corner case
that changing a file keeps mode, size and timestamp of it on the
filesystem.
The timetable below shows steps in one of typical such situations:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' N N
- 'hg status' shows "f" as "clean" N N N
---- ----------------------------------- ---- ----- -----
The most important point is that 'dirstate.write()' is executed at N+1
or later. This causes writing dirstate timestamp N of "f" out
successfully. If it is executed at N, 'parsers.pack_dirstate()'
replaces timestamp N with "-1" before actual writing dirstate out.
Occasional test failure for unexpected file status is typical example
of this corner case. Batch execution with small working directory is
finished in no time, and rarely satisfies condition (2) above.
This issue can occur in cases below;
- 'hg revert --rev REV' for revisions other than the parent
- failure of 'merge.update()' before 'merge.recordupdates()'
The root cause of this issue is that files are changed without
flushing in-memory dirstate changes via 'repo.commit()' (even though
omitting 'dirstate.normallookup()' on changed files also causes this
issue).
To detect changes of files correctly, this patch writes in-memory
dirstate changes out explicitly after marking files as clean in
'workingctx._checklookup()', which is invoked via 'repo.status()'.
After this change, timetable is changed as below:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
----------------------------------- ---- ----- -----
- 'dirsttate.write()' -1 -1
----------------------------------- ---- ----- -----
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' -1 -1
- 'hg status' -1 -1 N
---- ----------------------------------- ---- ----- -----
To reproduce this issue in tests certainly, this patch emulates some
timing critical actions as below:
- timestamp of "f" in '.hg/dirstate' is -1 at the beginning
'hg debugrebuildstate' before command invocation ensures it.
- make file "f" clean at N
- change "f" at N
'touch -t 200001010000' before and after command invocation
changes mtime of "f" to "2000-01-01 00:00" (= N).
- invoke 'dirstate.write()' via 'repo.status()' at N
'fakedirstatewritetime.py' forces 'pack_dirstate()' to use
"2000-01-01 00:00" as "now", only if 'pack_dirstate()' is invoked
via 'workingctx._checklookup()'.
- invoke 'dirstate.write()' via releasing wlock at N+1 (or "not at N")
'pack_dirstate()' via releasing wlock uses actual timestamp at
runtime as "now", and it should be different from the "2000-01-01
00:00" of "f".
BTW, this patch also changes 'test-largefiles-misc.t', because adding
'dirstate.write()' makes recent dirstate changes visible to external
process.
2015-07-08 11:01:09 +03:00
|
|
|
(this also tests that files reverted with '--rev REV' are treated as
|
|
|
|
|
"modified", even if none of mode, size and timestamp of them isn't
|
|
|
|
|
changed on the filesystem (see also issue4583))
|
|
|
|
|
|
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
|
> [fakedirstatewritetime]
|
|
|
|
|
> # emulate invoking dirstate.write() via repo.status()
|
|
|
|
|
> # at 2000-01-01 00:00
|
|
|
|
|
> fakenow = 200001010000
|
|
|
|
|
> EOF
|
|
|
|
|
|
2014-05-19 03:53:34 +04:00
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2015-02-11 03:17:15 +03:00
|
|
|
$ hg update -q 0
|
2015-04-24 17:52:41 +03:00
|
|
|
$ f -s f
|
|
|
|
|
f: size=17
|
|
|
|
|
$ touch -t 200001010000 f
|
context: write dirstate out explicitly after marking files as clean
To detect change of a file without redundant comparison of file
content, dirstate recognizes a file as certainly clean, if:
(1) it is already known as "normal",
(2) dirstate entry for it has valid (= not "-1") timestamp, and
(3) mode, size and timestamp of it on the filesystem are as same as
ones expected in dirstate
This works as expected in many cases, but doesn't in the corner case
that changing a file keeps mode, size and timestamp of it on the
filesystem.
The timetable below shows steps in one of typical such situations:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' N N
- 'hg status' shows "f" as "clean" N N N
---- ----------------------------------- ---- ----- -----
The most important point is that 'dirstate.write()' is executed at N+1
or later. This causes writing dirstate timestamp N of "f" out
successfully. If it is executed at N, 'parsers.pack_dirstate()'
replaces timestamp N with "-1" before actual writing dirstate out.
Occasional test failure for unexpected file status is typical example
of this corner case. Batch execution with small working directory is
finished in no time, and rarely satisfies condition (2) above.
This issue can occur in cases below;
- 'hg revert --rev REV' for revisions other than the parent
- failure of 'merge.update()' before 'merge.recordupdates()'
The root cause of this issue is that files are changed without
flushing in-memory dirstate changes via 'repo.commit()' (even though
omitting 'dirstate.normallookup()' on changed files also causes this
issue).
To detect changes of files correctly, this patch writes in-memory
dirstate changes out explicitly after marking files as clean in
'workingctx._checklookup()', which is invoked via 'repo.status()'.
After this change, timetable is changed as below:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
----------------------------------- ---- ----- -----
- 'dirsttate.write()' -1 -1
----------------------------------- ---- ----- -----
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' -1 -1
- 'hg status' -1 -1 N
---- ----------------------------------- ---- ----- -----
To reproduce this issue in tests certainly, this patch emulates some
timing critical actions as below:
- timestamp of "f" in '.hg/dirstate' is -1 at the beginning
'hg debugrebuildstate' before command invocation ensures it.
- make file "f" clean at N
- change "f" at N
'touch -t 200001010000' before and after command invocation
changes mtime of "f" to "2000-01-01 00:00" (= N).
- invoke 'dirstate.write()' via 'repo.status()' at N
'fakedirstatewritetime.py' forces 'pack_dirstate()' to use
"2000-01-01 00:00" as "now", only if 'pack_dirstate()' is invoked
via 'workingctx._checklookup()'.
- invoke 'dirstate.write()' via releasing wlock at N+1 (or "not at N")
'pack_dirstate()' via releasing wlock uses actual timestamp at
runtime as "now", and it should be different from the "2000-01-01
00:00" of "f".
BTW, this patch also changes 'test-largefiles-misc.t', because adding
'dirstate.write()' makes recent dirstate changes visible to external
process.
2015-07-08 11:01:09 +03:00
|
|
|
$ hg debugrebuildstate
|
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
|
> [extensions]
|
|
|
|
|
> fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
|
|
|
|
|
> EOF
|
2015-02-11 03:17:15 +03:00
|
|
|
$ hg revert -q -r 1 .
|
context: write dirstate out explicitly after marking files as clean
To detect change of a file without redundant comparison of file
content, dirstate recognizes a file as certainly clean, if:
(1) it is already known as "normal",
(2) dirstate entry for it has valid (= not "-1") timestamp, and
(3) mode, size and timestamp of it on the filesystem are as same as
ones expected in dirstate
This works as expected in many cases, but doesn't in the corner case
that changing a file keeps mode, size and timestamp of it on the
filesystem.
The timetable below shows steps in one of typical such situations:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' N N
- 'hg status' shows "f" as "clean" N N N
---- ----------------------------------- ---- ----- -----
The most important point is that 'dirstate.write()' is executed at N+1
or later. This causes writing dirstate timestamp N of "f" out
successfully. If it is executed at N, 'parsers.pack_dirstate()'
replaces timestamp N with "-1" before actual writing dirstate out.
Occasional test failure for unexpected file status is typical example
of this corner case. Batch execution with small working directory is
finished in no time, and rarely satisfies condition (2) above.
This issue can occur in cases below;
- 'hg revert --rev REV' for revisions other than the parent
- failure of 'merge.update()' before 'merge.recordupdates()'
The root cause of this issue is that files are changed without
flushing in-memory dirstate changes via 'repo.commit()' (even though
omitting 'dirstate.normallookup()' on changed files also causes this
issue).
To detect changes of files correctly, this patch writes in-memory
dirstate changes out explicitly after marking files as clean in
'workingctx._checklookup()', which is invoked via 'repo.status()'.
After this change, timetable is changed as below:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
----------------------------------- ---- ----- -----
- 'dirsttate.write()' -1 -1
----------------------------------- ---- ----- -----
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' -1 -1
- 'hg status' -1 -1 N
---- ----------------------------------- ---- ----- -----
To reproduce this issue in tests certainly, this patch emulates some
timing critical actions as below:
- timestamp of "f" in '.hg/dirstate' is -1 at the beginning
'hg debugrebuildstate' before command invocation ensures it.
- make file "f" clean at N
- change "f" at N
'touch -t 200001010000' before and after command invocation
changes mtime of "f" to "2000-01-01 00:00" (= N).
- invoke 'dirstate.write()' via 'repo.status()' at N
'fakedirstatewritetime.py' forces 'pack_dirstate()' to use
"2000-01-01 00:00" as "now", only if 'pack_dirstate()' is invoked
via 'workingctx._checklookup()'.
- invoke 'dirstate.write()' via releasing wlock at N+1 (or "not at N")
'pack_dirstate()' via releasing wlock uses actual timestamp at
runtime as "now", and it should be different from the "2000-01-01
00:00" of "f".
BTW, this patch also changes 'test-largefiles-misc.t', because adding
'dirstate.write()' makes recent dirstate changes visible to external
process.
2015-07-08 11:01:09 +03:00
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
|
> [extensions]
|
|
|
|
|
> fakedirstatewritetime = !
|
|
|
|
|
> EOF
|
2015-04-24 17:52:41 +03:00
|
|
|
$ f -s f
|
|
|
|
|
f: size=17
|
|
|
|
|
$ touch -t 200001010000 f
|
|
|
|
|
$ hg status f
|
|
|
|
|
M f
|
2014-05-19 03:53:34 +04:00
|
|
|
$ hg update -r 2
|
|
|
|
|
merging f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
revision 2
|
|
|
|
|
space
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2014-05-19 03:53:34 +04:00
|
|
|
|
|
|
|
|
update should also have --tool
|
|
|
|
|
|
|
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2015-02-11 03:17:15 +03:00
|
|
|
$ hg update -q 0
|
2015-04-24 17:52:41 +03:00
|
|
|
$ f -s f
|
|
|
|
|
f: size=17
|
|
|
|
|
$ touch -t 200001010000 f
|
context: write dirstate out explicitly after marking files as clean
To detect change of a file without redundant comparison of file
content, dirstate recognizes a file as certainly clean, if:
(1) it is already known as "normal",
(2) dirstate entry for it has valid (= not "-1") timestamp, and
(3) mode, size and timestamp of it on the filesystem are as same as
ones expected in dirstate
This works as expected in many cases, but doesn't in the corner case
that changing a file keeps mode, size and timestamp of it on the
filesystem.
The timetable below shows steps in one of typical such situations:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' N N
- 'hg status' shows "f" as "clean" N N N
---- ----------------------------------- ---- ----- -----
The most important point is that 'dirstate.write()' is executed at N+1
or later. This causes writing dirstate timestamp N of "f" out
successfully. If it is executed at N, 'parsers.pack_dirstate()'
replaces timestamp N with "-1" before actual writing dirstate out.
Occasional test failure for unexpected file status is typical example
of this corner case. Batch execution with small working directory is
finished in no time, and rarely satisfies condition (2) above.
This issue can occur in cases below;
- 'hg revert --rev REV' for revisions other than the parent
- failure of 'merge.update()' before 'merge.recordupdates()'
The root cause of this issue is that files are changed without
flushing in-memory dirstate changes via 'repo.commit()' (even though
omitting 'dirstate.normallookup()' on changed files also causes this
issue).
To detect changes of files correctly, this patch writes in-memory
dirstate changes out explicitly after marking files as clean in
'workingctx._checklookup()', which is invoked via 'repo.status()'.
After this change, timetable is changed as below:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
----------------------------------- ---- ----- -----
- 'dirsttate.write()' -1 -1
----------------------------------- ---- ----- -----
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' -1 -1
- 'hg status' -1 -1 N
---- ----------------------------------- ---- ----- -----
To reproduce this issue in tests certainly, this patch emulates some
timing critical actions as below:
- timestamp of "f" in '.hg/dirstate' is -1 at the beginning
'hg debugrebuildstate' before command invocation ensures it.
- make file "f" clean at N
- change "f" at N
'touch -t 200001010000' before and after command invocation
changes mtime of "f" to "2000-01-01 00:00" (= N).
- invoke 'dirstate.write()' via 'repo.status()' at N
'fakedirstatewritetime.py' forces 'pack_dirstate()' to use
"2000-01-01 00:00" as "now", only if 'pack_dirstate()' is invoked
via 'workingctx._checklookup()'.
- invoke 'dirstate.write()' via releasing wlock at N+1 (or "not at N")
'pack_dirstate()' via releasing wlock uses actual timestamp at
runtime as "now", and it should be different from the "2000-01-01
00:00" of "f".
BTW, this patch also changes 'test-largefiles-misc.t', because adding
'dirstate.write()' makes recent dirstate changes visible to external
process.
2015-07-08 11:01:09 +03:00
|
|
|
$ hg debugrebuildstate
|
|
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
|
> [extensions]
|
|
|
|
|
> fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
|
|
|
|
|
> EOF
|
2015-02-11 03:17:15 +03:00
|
|
|
$ hg revert -q -r 1 .
|
context: write dirstate out explicitly after marking files as clean
To detect change of a file without redundant comparison of file
content, dirstate recognizes a file as certainly clean, if:
(1) it is already known as "normal",
(2) dirstate entry for it has valid (= not "-1") timestamp, and
(3) mode, size and timestamp of it on the filesystem are as same as
ones expected in dirstate
This works as expected in many cases, but doesn't in the corner case
that changing a file keeps mode, size and timestamp of it on the
filesystem.
The timetable below shows steps in one of typical such situations:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' N N
- 'hg status' shows "f" as "clean" N N N
---- ----------------------------------- ---- ----- -----
The most important point is that 'dirstate.write()' is executed at N+1
or later. This causes writing dirstate timestamp N of "f" out
successfully. If it is executed at N, 'parsers.pack_dirstate()'
replaces timestamp N with "-1" before actual writing dirstate out.
Occasional test failure for unexpected file status is typical example
of this corner case. Batch execution with small working directory is
finished in no time, and rarely satisfies condition (2) above.
This issue can occur in cases below;
- 'hg revert --rev REV' for revisions other than the parent
- failure of 'merge.update()' before 'merge.recordupdates()'
The root cause of this issue is that files are changed without
flushing in-memory dirstate changes via 'repo.commit()' (even though
omitting 'dirstate.normallookup()' on changed files also causes this
issue).
To detect changes of files correctly, this patch writes in-memory
dirstate changes out explicitly after marking files as clean in
'workingctx._checklookup()', which is invoked via 'repo.status()'.
After this change, timetable is changed as below:
---- ----------------------------------- ----------------
timestamp of "f"
----------------
dirstate file-
time action mem file system
---- ----------------------------------- ---- ----- -----
N -1 ***
- make file "f" clean N
- execute 'hg foobar'
- instantiate 'dirstate' -1 -1
- 'dirstate.normal("f")' N -1
(e.g. via dirty check)
----------------------------------- ---- ----- -----
- 'dirsttate.write()' -1 -1
----------------------------------- ---- ----- -----
- change "f", but keep size N
N+1
- release wlock
- 'dirstate.write()' -1 -1
- 'hg status' -1 -1 N
---- ----------------------------------- ---- ----- -----
To reproduce this issue in tests certainly, this patch emulates some
timing critical actions as below:
- timestamp of "f" in '.hg/dirstate' is -1 at the beginning
'hg debugrebuildstate' before command invocation ensures it.
- make file "f" clean at N
- change "f" at N
'touch -t 200001010000' before and after command invocation
changes mtime of "f" to "2000-01-01 00:00" (= N).
- invoke 'dirstate.write()' via 'repo.status()' at N
'fakedirstatewritetime.py' forces 'pack_dirstate()' to use
"2000-01-01 00:00" as "now", only if 'pack_dirstate()' is invoked
via 'workingctx._checklookup()'.
- invoke 'dirstate.write()' via releasing wlock at N+1 (or "not at N")
'pack_dirstate()' via releasing wlock uses actual timestamp at
runtime as "now", and it should be different from the "2000-01-01
00:00" of "f".
BTW, this patch also changes 'test-largefiles-misc.t', because adding
'dirstate.write()' makes recent dirstate changes visible to external
process.
2015-07-08 11:01:09 +03:00
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
|
> [extensions]
|
|
|
|
|
> fakedirstatewritetime = !
|
|
|
|
|
> EOF
|
2015-04-24 17:52:41 +03:00
|
|
|
$ f -s f
|
|
|
|
|
f: size=17
|
|
|
|
|
$ touch -t 200001010000 f
|
|
|
|
|
$ hg status f
|
|
|
|
|
M f
|
2014-05-19 03:53:34 +04:00
|
|
|
$ hg update -r 2 --tool false
|
|
|
|
|
merging f
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges
|
|
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2014-05-19 03:53:34 +04:00
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
Default is silent simplemerge:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 3
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
revision 3
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
.premerge=True is same:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 3 --config merge-tools.true.premerge=True
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
revision 3
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
.premerge=False executes merge-tool:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -r 3 --config merge-tools.true.premerge=False
|
2011-02-18 05:35:01 +03:00
|
|
|
merging f
|
2010-09-26 22:43:21 +04:00
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
revision 3
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
2012-06-15 17:10:19 +04:00
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
2014-08-05 03:50:15 +04:00
|
|
|
premerge=keep keeps conflict markers in:
|
|
|
|
|
|
|
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ hg merge -r 4 --config merge-tools.true.premerge=keep
|
|
|
|
|
merging f
|
2016-11-20 02:41:37 +03:00
|
|
|
<<<<<<< working copy: ef83787e2614 - test: revision 1
|
2014-08-05 03:50:15 +04:00
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
=======
|
|
|
|
|
revision 4
|
2016-10-07 18:51:50 +03:00
|
|
|
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
|
2014-08-05 03:50:15 +04:00
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
revision 4
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
2016-11-20 02:41:37 +03:00
|
|
|
<<<<<<< working copy: ef83787e2614 - test: revision 1
|
2014-08-05 03:50:15 +04:00
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
=======
|
|
|
|
|
revision 4
|
2016-10-07 18:51:50 +03:00
|
|
|
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
|
2014-08-05 03:50:15 +04:00
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2014-08-05 03:50:15 +04:00
|
|
|
|
2014-08-05 03:32:41 +04:00
|
|
|
premerge=keep-merge3 keeps conflict markers with base content:
|
|
|
|
|
|
|
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3
|
|
|
|
|
merging f
|
2016-11-20 02:41:37 +03:00
|
|
|
<<<<<<< working copy: ef83787e2614 - test: revision 1
|
2014-08-05 03:32:41 +04:00
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
||||||| base
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
=======
|
|
|
|
|
revision 4
|
2016-10-07 18:51:50 +03:00
|
|
|
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
|
2014-08-05 03:32:41 +04:00
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
revision 4
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
2016-11-20 02:41:37 +03:00
|
|
|
<<<<<<< working copy: ef83787e2614 - test: revision 1
|
2014-08-05 03:32:41 +04:00
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
||||||| base
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
=======
|
|
|
|
|
revision 4
|
2016-10-07 18:51:50 +03:00
|
|
|
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
|
2014-08-05 03:32:41 +04:00
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2014-08-05 03:32:41 +04:00
|
|
|
|
2014-08-05 03:50:15 +04:00
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
Tool execution
|
|
|
|
|
|
2011-10-13 06:27:49 +04:00
|
|
|
set tools.args explicit to include $base $local $other $output:
|
|
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \
|
|
|
|
|
> | sed 's,==> .* <==,==> ... <==,g'
|
2011-02-18 05:35:01 +03:00
|
|
|
merging f
|
2010-09-26 22:43:21 +04:00
|
|
|
==> ... <==
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
|
|
|
|
|
==> ... <==
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
|
|
|
|
|
==> ... <==
|
|
|
|
|
revision 2
|
|
|
|
|
space
|
|
|
|
|
|
|
|
|
|
==> ... <==
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2011-10-13 06:27:49 +04:00
|
|
|
|
|
|
|
|
Merge with "echo mergeresult > $local":
|
|
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local'
|
|
|
|
|
merging f
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
mergeresult
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2011-10-13 06:27:49 +04:00
|
|
|
|
|
|
|
|
- and $local is the file f:
|
|
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f'
|
|
|
|
|
merging f
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
mergeresult
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2011-10-13 06:27:49 +04:00
|
|
|
|
|
|
|
|
Merge with "echo mergeresult > $output" - the variable is a bit magic:
|
|
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output'
|
|
|
|
|
merging f
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
mergeresult
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
|
|
|
|
Merge using tool with a path that must be quoted:
|
|
|
|
|
|
|
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
|
|
|
|
$ cat <<EOF > 'my merge tool'
|
|
|
|
|
> cat "\$1" "\$2" "\$3" > "\$4"
|
|
|
|
|
> EOF
|
2012-06-15 19:32:33 +04:00
|
|
|
$ hg --config merge-tools.true.executable='sh' \
|
|
|
|
|
> --config merge-tools.true.args='"./my merge tool" $base $local $other $output' \
|
|
|
|
|
> merge -r 2
|
2010-09-26 22:43:21 +04:00
|
|
|
merging f
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
$ rm -f 'my merge tool'
|
|
|
|
|
$ aftermerge
|
|
|
|
|
# cat f
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
revision 2
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
R f
|
2010-09-26 22:43:21 +04:00
|
|
|
|
2012-10-26 23:02:58 +04:00
|
|
|
Issue3581: Merging a filename that needs to be quoted
|
2012-11-01 23:59:55 +04:00
|
|
|
(This test doesn't work on Windows filesystems even on Linux, so check
|
|
|
|
|
for Unix-like permission)
|
2012-10-26 23:02:58 +04:00
|
|
|
|
2012-11-01 23:59:55 +04:00
|
|
|
#if unix-permissions
|
2012-10-26 23:02:58 +04:00
|
|
|
$ beforemerge
|
|
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2014-08-05 03:39:47 +04:00
|
|
|
$ echo "revision 5" > '"; exit 1; echo "'
|
|
|
|
|
$ hg commit -Am "revision 5"
|
2012-10-26 23:02:58 +04:00
|
|
|
adding "; exit 1; echo "
|
|
|
|
|
warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "'
|
|
|
|
|
$ hg update -C 1 > /dev/null
|
2014-08-05 03:39:47 +04:00
|
|
|
$ echo "revision 6" > '"; exit 1; echo "'
|
|
|
|
|
$ hg commit -Am "revision 6"
|
2012-10-26 23:02:58 +04:00
|
|
|
adding "; exit 1; echo "
|
|
|
|
|
warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "'
|
|
|
|
|
created new head
|
2014-08-05 03:39:47 +04:00
|
|
|
$ hg merge --config merge-tools.true.executable="true" -r 5
|
2012-10-26 23:02:58 +04:00
|
|
|
merging "; exit 1; echo "
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
|
|
|
|
$ hg update -C 1 > /dev/null
|
2012-10-31 04:23:51 +04:00
|
|
|
#endif
|
2012-10-26 23:02:58 +04:00
|
|
|
|
2010-09-26 22:43:21 +04:00
|
|
|
Merge post-processing
|
|
|
|
|
|
|
|
|
|
cat is a bad merge-tool and doesn't change:
|
|
|
|
|
|
2012-06-15 17:10:19 +04:00
|
|
|
$ beforemerge
|
2010-09-26 22:43:21 +04:00
|
|
|
[merge-tools]
|
|
|
|
|
false.whatever=
|
|
|
|
|
true.priority=1
|
|
|
|
|
true.executable=cat
|
|
|
|
|
# hg update -C 1
|
2012-06-15 17:10:19 +04:00
|
|
|
$ hg merge -y -r 2 --config merge-tools.true.checkchanged=1
|
2011-02-18 05:35:01 +03:00
|
|
|
merging f
|
2010-09-26 22:43:21 +04:00
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
revision 0
|
|
|
|
|
space
|
|
|
|
|
revision 2
|
|
|
|
|
space
|
|
|
|
|
output file f appears unchanged
|
|
|
|
|
was merge successful (yn)? n
|
|
|
|
|
merging f failed!
|
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
2012-06-15 17:10:19 +04:00
|
|
|
[1]
|
|
|
|
|
$ aftermerge
|
2010-09-26 22:43:21 +04:00
|
|
|
# cat f
|
|
|
|
|
revision 1
|
|
|
|
|
space
|
|
|
|
|
# hg stat
|
|
|
|
|
M f
|
|
|
|
|
? f.orig
|
2015-11-11 04:10:47 +03:00
|
|
|
# hg resolve --list
|
|
|
|
|
U f
|
2013-01-08 07:15:41 +04:00
|
|
|
|
|
|
|
|
#if symlink
|
|
|
|
|
|
|
|
|
|
internal merge cannot handle symlinks and shouldn't try:
|
|
|
|
|
|
|
|
|
|
$ hg update -q -C 1
|
|
|
|
|
$ rm f
|
|
|
|
|
$ ln -s symlink f
|
|
|
|
|
$ hg commit -qm 'f is symlink'
|
|
|
|
|
$ hg merge -r 2 --tool internal:merge
|
|
|
|
|
merging f
|
2014-09-28 19:15:28 +04:00
|
|
|
warning: internal :merge cannot merge symlinks for f
|
2015-10-09 23:54:52 +03:00
|
|
|
warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
|
2013-01-08 07:15:41 +04:00
|
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
|
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
|
|
|
[1]
|
|
|
|
|
|
|
|
|
|
#endif
|
2016-11-24 01:47:38 +03:00
|
|
|
|
|
|
|
|
Verify naming of temporary files and that extension is preserved:
|
|
|
|
|
|
|
|
|
|
$ hg update -q -C 1
|
|
|
|
|
$ hg mv f f.txt
|
|
|
|
|
$ hg ci -qm "f.txt"
|
|
|
|
|
$ hg update -q -C 2
|
|
|
|
|
$ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output'
|
|
|
|
|
merging f and f.txt to f.txt
|
|
|
|
|
*/f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob)
|
|
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
(branch merge, don't forget to commit)
|
