2014-08-06 20:43:59 +04:00
|
|
|
#require svn15
|
2010-08-17 18:53:03 +04:00
|
|
|
|
2012-06-26 05:35:22 +04:00
|
|
|
$ SVNREPOPATH=`pwd`/svn-repo
|
|
|
|
#if windows
|
2014-10-15 23:35:59 +04:00
|
|
|
$ SVNREPOURL=file:///`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
|
2012-06-26 05:35:22 +04:00
|
|
|
#else
|
2014-10-15 23:35:59 +04:00
|
|
|
$ SVNREPOURL=file://`$PYTHON -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
|
2012-06-26 05:35:22 +04:00
|
|
|
#endif
|
2010-08-17 18:53:03 +04:00
|
|
|
|
2015-09-26 09:20:32 +03:00
|
|
|
$ filter_svn_output () {
|
2016-03-14 18:14:53 +03:00
|
|
|
> egrep -v 'Committing|Transmitting|Updating|(^$)' || true
|
2015-09-26 09:20:32 +03:00
|
|
|
> }
|
|
|
|
|
2010-08-17 18:53:03 +04:00
|
|
|
create subversion repo
|
|
|
|
|
|
|
|
$ WCROOT="`pwd`/svn-wc"
|
|
|
|
$ svnadmin create svn-repo
|
2012-06-26 05:35:22 +04:00
|
|
|
$ svn co "$SVNREPOURL" svn-wc
|
2010-08-17 18:53:03 +04:00
|
|
|
Checked out revision 0.
|
|
|
|
$ cd svn-wc
|
|
|
|
$ mkdir src
|
|
|
|
$ echo alpha > src/alpha
|
|
|
|
$ svn add src
|
|
|
|
A src
|
2012-06-23 20:54:08 +04:00
|
|
|
A src/alpha (glob)
|
2010-08-17 18:53:03 +04:00
|
|
|
$ mkdir externals
|
|
|
|
$ echo other > externals/other
|
|
|
|
$ svn add externals
|
|
|
|
A externals
|
2012-06-23 20:54:08 +04:00
|
|
|
A externals/other (glob)
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn ci -qm 'Add alpha'
|
2011-12-02 19:50:48 +04:00
|
|
|
$ svn up -q
|
2012-06-26 05:35:22 +04:00
|
|
|
$ echo "externals -r1 $SVNREPOURL/externals" > extdef
|
2010-08-17 18:53:03 +04:00
|
|
|
$ svn propset -F extdef svn:externals src
|
|
|
|
property 'svn:externals' set on 'src'
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn ci -qm 'Setting externals'
|
2010-08-17 18:53:03 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
create hg repo
|
|
|
|
|
|
|
|
$ mkdir sub
|
|
|
|
$ cd sub
|
|
|
|
$ hg init t
|
|
|
|
$ cd t
|
|
|
|
|
|
|
|
first revision, no sub
|
|
|
|
|
|
|
|
$ echo a > a
|
|
|
|
$ hg ci -Am0
|
|
|
|
adding a
|
|
|
|
|
|
|
|
add first svn sub with leading whitespaces
|
|
|
|
|
2012-06-26 05:35:22 +04:00
|
|
|
$ echo "s = [svn] $SVNREPOURL/src" >> .hgsub
|
|
|
|
$ echo "subdir/s = [svn] $SVNREPOURL/src" >> .hgsub
|
|
|
|
$ svn co --quiet "$SVNREPOURL"/src s
|
2010-11-17 23:25:23 +03:00
|
|
|
$ mkdir subdir
|
2012-06-26 05:35:22 +04:00
|
|
|
$ svn co --quiet "$SVNREPOURL"/src subdir/s
|
2010-08-17 18:53:03 +04:00
|
|
|
$ hg add .hgsub
|
|
|
|
$ hg ci -m1
|
|
|
|
|
2010-10-21 12:28:51 +04:00
|
|
|
make sure we avoid empty commits (issue2445)
|
|
|
|
|
|
|
|
$ hg sum
|
|
|
|
parent: 1:* tip (glob)
|
|
|
|
1
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 2 draft
|
2010-10-21 12:28:51 +04:00
|
|
|
$ hg ci -moops
|
|
|
|
nothing changed
|
|
|
|
[1]
|
|
|
|
|
2010-08-17 18:53:03 +04:00
|
|
|
debugsub
|
|
|
|
|
2010-09-22 01:44:13 +04:00
|
|
|
$ hg debugsub
|
2010-08-17 18:53:03 +04:00
|
|
|
path s
|
2010-10-10 00:06:22 +04:00
|
|
|
source file://*/svn-repo/src (glob)
|
2010-08-17 18:53:03 +04:00
|
|
|
revision 2
|
2010-11-17 23:25:23 +03:00
|
|
|
path subdir/s
|
|
|
|
source file://*/svn-repo/src (glob)
|
|
|
|
revision 2
|
2010-08-17 18:53:03 +04:00
|
|
|
|
|
|
|
change file in svn and hg, commit
|
|
|
|
|
|
|
|
$ echo a >> a
|
|
|
|
$ echo alpha >> s/alpha
|
2010-10-21 12:28:51 +04:00
|
|
|
$ hg sum
|
|
|
|
parent: 1:* tip (glob)
|
|
|
|
1
|
|
|
|
branch: default
|
|
|
|
commit: 1 modified, 1 subrepos
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 2 draft
|
2015-09-26 09:20:32 +03:00
|
|
|
$ hg commit --subrepos -m 'Message!' | filter_svn_output
|
2010-08-17 18:53:03 +04:00
|
|
|
committing subrepository s
|
2010-09-23 03:20:47 +04:00
|
|
|
Sending*s/alpha (glob)
|
2010-08-17 18:53:03 +04:00
|
|
|
Committed revision 3.
|
2011-12-02 19:50:48 +04:00
|
|
|
Fetching external item into '*s/externals'* (glob)
|
2010-08-17 18:53:03 +04:00
|
|
|
External at revision 1.
|
|
|
|
At revision 3.
|
2010-09-22 01:44:13 +04:00
|
|
|
$ hg debugsub
|
2010-08-17 18:53:03 +04:00
|
|
|
path s
|
2010-10-10 00:06:22 +04:00
|
|
|
source file://*/svn-repo/src (glob)
|
2010-08-17 18:53:03 +04:00
|
|
|
revision 3
|
2010-11-17 23:25:23 +03:00
|
|
|
path subdir/s
|
|
|
|
source file://*/svn-repo/src (glob)
|
|
|
|
revision 2
|
2010-08-17 18:53:03 +04:00
|
|
|
|
2012-04-26 13:55:07 +04:00
|
|
|
missing svn file, commit should fail
|
|
|
|
|
|
|
|
$ rm s/alpha
|
|
|
|
$ hg commit --subrepos -m 'abort on missing file'
|
|
|
|
committing subrepository s
|
2012-12-14 02:37:53 +04:00
|
|
|
abort: cannot commit missing svn entries (in subrepo s)
|
2012-04-26 13:55:07 +04:00
|
|
|
[255]
|
|
|
|
$ svn revert s/alpha > /dev/null
|
|
|
|
|
2011-01-22 18:15:40 +03:00
|
|
|
add an unrelated revision in svn and update the subrepo to without
|
|
|
|
bringing any changes.
|
|
|
|
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn mkdir "$SVNREPOURL/unrelated" -qm 'create unrelated'
|
2011-12-02 19:50:48 +04:00
|
|
|
$ svn up -q s
|
2011-01-22 18:15:40 +03:00
|
|
|
$ hg sum
|
|
|
|
parent: 2:* tip (glob)
|
|
|
|
Message!
|
|
|
|
branch: default
|
|
|
|
commit: (clean)
|
|
|
|
update: (current)
|
2015-05-29 23:23:58 +03:00
|
|
|
phases: 3 draft
|
2011-01-22 18:15:40 +03:00
|
|
|
|
2010-08-17 18:53:03 +04:00
|
|
|
$ echo a > s/a
|
|
|
|
|
|
|
|
should be empty despite change to s/a
|
|
|
|
|
|
|
|
$ hg st
|
|
|
|
|
|
|
|
add a commit from svn
|
|
|
|
|
2012-06-26 05:35:22 +04:00
|
|
|
$ cd "$WCROOT/src"
|
2011-12-02 19:50:48 +04:00
|
|
|
$ svn up -q
|
2010-08-17 18:53:03 +04:00
|
|
|
$ echo xyz >> alpha
|
|
|
|
$ svn propset svn:mime-type 'text/xml' alpha
|
|
|
|
property 'svn:mime-type' set on 'alpha'
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn ci -qm 'amend a from svn'
|
2010-08-17 18:53:03 +04:00
|
|
|
$ cd ../../sub/t
|
|
|
|
|
|
|
|
this commit from hg will fail
|
|
|
|
|
|
|
|
$ echo zzz >> s/alpha
|
2011-12-02 19:50:48 +04:00
|
|
|
$ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
|
2010-08-17 18:53:03 +04:00
|
|
|
committing subrepository s
|
2011-12-02 19:50:48 +04:00
|
|
|
abort: svn:*Commit failed (details follow): (glob)
|
2010-09-22 01:44:13 +04:00
|
|
|
[255]
|
2010-08-17 18:53:03 +04:00
|
|
|
$ svn revert -q s/alpha
|
|
|
|
|
|
|
|
this commit fails because of meta changes
|
|
|
|
|
|
|
|
$ svn propset svn:mime-type 'text/html' s/alpha
|
2012-06-23 20:54:08 +04:00
|
|
|
property 'svn:mime-type' set on 's/alpha' (glob)
|
2011-12-02 19:50:48 +04:00
|
|
|
$ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
|
2010-08-17 18:53:03 +04:00
|
|
|
committing subrepository s
|
2011-12-02 19:50:48 +04:00
|
|
|
abort: svn:*Commit failed (details follow): (glob)
|
2010-09-22 01:44:13 +04:00
|
|
|
[255]
|
2010-08-17 18:53:03 +04:00
|
|
|
$ svn revert -q s/alpha
|
|
|
|
|
|
|
|
this commit fails because of externals changes
|
|
|
|
|
|
|
|
$ echo zzz > s/externals/other
|
2011-10-21 02:33:08 +04:00
|
|
|
$ hg ci --subrepos -m 'amend externals from hg'
|
2010-08-17 18:53:03 +04:00
|
|
|
committing subrepository s
|
2012-12-14 02:37:53 +04:00
|
|
|
abort: cannot commit svn externals (in subrepo s)
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-09-11 00:52:00 +04:00
|
|
|
$ hg diff --subrepos -r 1:2 | grep -v diff
|
|
|
|
--- a/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/.hgsubstate Thu Jan 01 00:00:00 1970 +0000
|
2010-11-17 23:25:23 +03:00
|
|
|
@@ -1,2 +1,2 @@
|
2010-09-11 00:52:00 +04:00
|
|
|
-2 s
|
|
|
|
+3 s
|
2010-11-17 23:25:23 +03:00
|
|
|
2 subdir/s
|
2010-09-11 00:52:00 +04:00
|
|
|
--- a/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/a Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,1 +1,2 @@
|
|
|
|
a
|
|
|
|
+a
|
2010-08-17 18:53:03 +04:00
|
|
|
$ svn revert -q s/externals/other
|
|
|
|
|
|
|
|
this commit fails because of externals meta changes
|
|
|
|
|
|
|
|
$ svn propset svn:mime-type 'text/html' s/externals/other
|
2012-06-23 20:54:08 +04:00
|
|
|
property 'svn:mime-type' set on 's/externals/other' (glob)
|
2011-10-21 02:33:08 +04:00
|
|
|
$ hg ci --subrepos -m 'amend externals from hg'
|
2010-08-17 18:53:03 +04:00
|
|
|
committing subrepository s
|
2012-12-14 02:37:53 +04:00
|
|
|
abort: cannot commit svn externals (in subrepo s)
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-17 18:53:03 +04:00
|
|
|
$ svn revert -q s/externals/other
|
|
|
|
|
|
|
|
clone
|
|
|
|
|
|
|
|
$ cd ..
|
2012-06-26 05:35:22 +04:00
|
|
|
$ hg clone t tc
|
2010-08-17 18:53:03 +04:00
|
|
|
updating to branch default
|
2012-06-26 05:35:22 +04:00
|
|
|
A tc/s/alpha (glob)
|
|
|
|
U tc/s (glob)
|
2010-08-17 18:53:03 +04:00
|
|
|
|
2011-12-02 19:50:48 +04:00
|
|
|
Fetching external item into 'tc/s/externals'* (glob)
|
2012-06-26 05:35:22 +04:00
|
|
|
A tc/s/externals/other (glob)
|
2010-08-17 18:53:03 +04:00
|
|
|
Checked out external at revision 1.
|
|
|
|
|
|
|
|
Checked out revision 3.
|
2012-06-26 05:35:22 +04:00
|
|
|
A tc/subdir/s/alpha (glob)
|
|
|
|
U tc/subdir/s (glob)
|
2011-04-07 18:47:30 +04:00
|
|
|
|
2011-12-02 19:50:48 +04:00
|
|
|
Fetching external item into 'tc/subdir/s/externals'* (glob)
|
2012-06-26 05:35:22 +04:00
|
|
|
A tc/subdir/s/externals/other (glob)
|
2011-04-07 18:47:30 +04:00
|
|
|
Checked out external at revision 1.
|
|
|
|
|
|
|
|
Checked out revision 2.
|
2010-08-17 18:53:03 +04:00
|
|
|
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd tc
|
|
|
|
|
|
|
|
debugsub in clone
|
|
|
|
|
2010-09-22 01:44:13 +04:00
|
|
|
$ hg debugsub
|
2010-08-17 18:53:03 +04:00
|
|
|
path s
|
2010-10-10 00:06:22 +04:00
|
|
|
source file://*/svn-repo/src (glob)
|
2010-08-17 18:53:03 +04:00
|
|
|
revision 3
|
2010-11-17 23:25:23 +03:00
|
|
|
path subdir/s
|
|
|
|
source file://*/svn-repo/src (glob)
|
|
|
|
revision 2
|
2010-08-17 18:53:03 +04:00
|
|
|
|
|
|
|
verify subrepo is contained within the repo directory
|
|
|
|
|
2014-10-15 23:35:59 +04:00
|
|
|
$ $PYTHON -c "import os.path; print os.path.exists('s')"
|
2010-08-17 18:53:03 +04:00
|
|
|
True
|
2010-11-05 17:13:22 +03:00
|
|
|
|
|
|
|
update to nullrev (must delete the subrepo)
|
|
|
|
|
|
|
|
$ hg up null
|
|
|
|
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
2010-11-17 23:25:23 +03:00
|
|
|
$ ls
|
2011-01-31 15:33:41 +03:00
|
|
|
|
|
|
|
Check hg update --clean
|
2012-06-26 05:35:22 +04:00
|
|
|
$ cd "$TESTTMP/sub/t"
|
2011-01-31 15:33:41 +03:00
|
|
|
$ cd s
|
|
|
|
$ echo c0 > alpha
|
|
|
|
$ echo c1 > f1
|
|
|
|
$ echo c1 > f2
|
|
|
|
$ svn add f1 -q
|
2011-12-02 19:50:48 +04:00
|
|
|
$ svn status | sort
|
|
|
|
|
2011-02-16 01:19:11 +03:00
|
|
|
? * a (glob)
|
|
|
|
? * f2 (glob)
|
|
|
|
A * f1 (glob)
|
2011-12-02 19:50:48 +04:00
|
|
|
M * alpha (glob)
|
|
|
|
Performing status on external item at 'externals'* (glob)
|
|
|
|
X * externals (glob)
|
2011-02-01 23:39:28 +03:00
|
|
|
$ cd ../..
|
|
|
|
$ hg -R t update -C
|
2011-01-31 15:33:41 +03:00
|
|
|
|
2011-12-02 19:50:48 +04:00
|
|
|
Fetching external item into 't/s/externals'* (glob)
|
2011-01-31 15:33:41 +03:00
|
|
|
Checked out external at revision 1.
|
|
|
|
|
|
|
|
Checked out revision 3.
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2011-02-01 23:39:28 +03:00
|
|
|
$ cd t/s
|
2012-04-27 12:17:55 +04:00
|
|
|
$ svn status | sort
|
|
|
|
|
2011-02-16 01:19:11 +03:00
|
|
|
? * a (glob)
|
|
|
|
? * f1 (glob)
|
|
|
|
? * f2 (glob)
|
2011-12-02 19:50:48 +04:00
|
|
|
Performing status on external item at 'externals'* (glob)
|
2012-04-27 12:17:55 +04:00
|
|
|
X * externals (glob)
|
2011-02-09 12:53:09 +03:00
|
|
|
|
|
|
|
Sticky subrepositories, no changes
|
2012-06-26 05:35:22 +04:00
|
|
|
$ cd "$TESTTMP/sub/t"
|
2011-02-09 12:53:09 +03:00
|
|
|
$ hg id -n
|
|
|
|
2
|
|
|
|
$ cd s
|
|
|
|
$ svnversion
|
|
|
|
3
|
|
|
|
$ cd ..
|
|
|
|
$ hg update 1
|
2011-12-02 19:50:48 +04:00
|
|
|
U *s/alpha (glob)
|
2011-02-09 12:53:09 +03:00
|
|
|
|
2011-12-02 19:50:48 +04:00
|
|
|
Fetching external item into '*s/externals'* (glob)
|
2011-02-09 12:53:09 +03:00
|
|
|
Checked out external at revision 1.
|
|
|
|
|
|
|
|
Checked out revision 2.
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg id -n
|
|
|
|
1
|
|
|
|
$ cd s
|
|
|
|
$ svnversion
|
|
|
|
2
|
|
|
|
$ cd ..
|
|
|
|
|
2014-04-13 21:01:00 +04:00
|
|
|
Sticky subrepositories, file changes
|
2011-02-09 12:53:09 +03:00
|
|
|
$ touch s/f1
|
|
|
|
$ cd s
|
|
|
|
$ svn add f1
|
|
|
|
A f1
|
|
|
|
$ cd ..
|
|
|
|
$ hg id -n
|
2012-07-27 15:56:19 +04:00
|
|
|
1+
|
2011-02-09 12:53:09 +03:00
|
|
|
$ cd s
|
|
|
|
$ svnversion
|
|
|
|
2M
|
|
|
|
$ cd ..
|
|
|
|
$ hg update tip
|
merge: let the user choose to merge, keep local or keep remote subrepo revisions
When a subrepo has changed on the local and remote revisions, prompt the user
whether it wants to merge those subrepo revisions, keep the local revision or
keep the remote revision.
Up until now mercurial would always perform a merge on a subrepo that had
changed on the local and the remote revisions. This is often inconvenient. For
example:
- You may want to perform the actual subrepo merge after you have merged the
parent subrepo files.
- Some subrepos may be considered "read only", in the sense that you are not
supposed to add new revisions to them. In those cases "merging a subrepo" means
choosing which _existing_ revision you want to use on the merged revision. This
is often the case for subrepos that contain binary dependencies (such as DLLs,
etc).
This new prompt makes mercurial better cope with those common scenarios.
Notes:
- The default behavior (which is the one that is used when ui is not
interactive) remains unchanged (i.e. merge is the default action).
- This prompt will be shown even if the ui --tool flag is set.
- I don't know of a way to test the "keep local" and "keep remote" options (i.e.
to force the test to choose those options).
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1378420708 -7200
# Fri Sep 06 00:38:28 2013 +0200
# Node ID 2fb9cb0c7b26303ac3178b7739975e663075857d
# Parent 796d34e1b749b79834321ef1181ed8433a5515d9
merge: let the user choose to merge, keep local or keep remote subrepo revisions
When a subrepo has changed on the local and remote revisions, prompt the user
whether it wants to merge those subrepo revisions, keep the local revision or
keep the remote revision.
Up until now mercurial would always perform a merge on a subrepo that had
changed on the local and the remote revisions. This is often inconvenient. For
example:
- You may want to perform the actual subrepo merge after you have merged the
parent subrepo files.
- Some subrepos may be considered "read only", in the sense that you are not
supposed to add new revisions to them. In those cases "merging a subrepo" means
choosing which _existing_ revision you want to use on the merged revision. This
is often the case for subrepos that contain binary dependencies (such as DLLs,
etc).
This new prompt makes mercurial better cope with those common scenarios.
Notes:
- The default behavior (which is the one that is used when ui is not
interactive) remains unchanged (i.e. merge is the default action).
- This prompt will be shown even if the ui --tool flag is set.
- I don't know of a way to test the "keep local" and "keep remote" options (i.e.
to force the test to choose those options).
2013-09-06 02:38:28 +04:00
|
|
|
subrepository s diverged (local revision: 2, remote revision: 3)
|
2016-10-08 11:25:28 +03:00
|
|
|
(M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
|
2011-02-09 12:53:09 +03:00
|
|
|
subrepository sources for s differ
|
2014-10-01 03:08:17 +04:00
|
|
|
use (l)ocal source (2) or (r)emote source (3)? l
|
2011-02-09 12:53:09 +03:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg id -n
|
|
|
|
2+
|
|
|
|
$ cd s
|
|
|
|
$ svnversion
|
|
|
|
2M
|
|
|
|
$ cd ..
|
|
|
|
$ hg update --clean tip
|
2011-12-02 19:50:48 +04:00
|
|
|
U *s/alpha (glob)
|
2011-02-09 12:53:09 +03:00
|
|
|
|
2011-12-02 19:50:48 +04:00
|
|
|
Fetching external item into '*s/externals'* (glob)
|
2011-02-09 12:53:09 +03:00
|
|
|
Checked out external at revision 1.
|
|
|
|
|
|
|
|
Checked out revision 3.
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
|
|
|
|
Sticky subrepository, revision updates
|
|
|
|
$ hg id -n
|
|
|
|
2
|
|
|
|
$ cd s
|
|
|
|
$ svnversion
|
|
|
|
3
|
|
|
|
$ cd ..
|
|
|
|
$ cd s
|
2011-12-02 19:50:48 +04:00
|
|
|
$ svn update -qr 1
|
2011-02-09 12:53:09 +03:00
|
|
|
$ cd ..
|
|
|
|
$ hg update 1
|
merge: let the user choose to merge, keep local or keep remote subrepo revisions
When a subrepo has changed on the local and remote revisions, prompt the user
whether it wants to merge those subrepo revisions, keep the local revision or
keep the remote revision.
Up until now mercurial would always perform a merge on a subrepo that had
changed on the local and the remote revisions. This is often inconvenient. For
example:
- You may want to perform the actual subrepo merge after you have merged the
parent subrepo files.
- Some subrepos may be considered "read only", in the sense that you are not
supposed to add new revisions to them. In those cases "merging a subrepo" means
choosing which _existing_ revision you want to use on the merged revision. This
is often the case for subrepos that contain binary dependencies (such as DLLs,
etc).
This new prompt makes mercurial better cope with those common scenarios.
Notes:
- The default behavior (which is the one that is used when ui is not
interactive) remains unchanged (i.e. merge is the default action).
- This prompt will be shown even if the ui --tool flag is set.
- I don't know of a way to test the "keep local" and "keep remote" options (i.e.
to force the test to choose those options).
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1378420708 -7200
# Fri Sep 06 00:38:28 2013 +0200
# Node ID 2fb9cb0c7b26303ac3178b7739975e663075857d
# Parent 796d34e1b749b79834321ef1181ed8433a5515d9
merge: let the user choose to merge, keep local or keep remote subrepo revisions
When a subrepo has changed on the local and remote revisions, prompt the user
whether it wants to merge those subrepo revisions, keep the local revision or
keep the remote revision.
Up until now mercurial would always perform a merge on a subrepo that had
changed on the local and the remote revisions. This is often inconvenient. For
example:
- You may want to perform the actual subrepo merge after you have merged the
parent subrepo files.
- Some subrepos may be considered "read only", in the sense that you are not
supposed to add new revisions to them. In those cases "merging a subrepo" means
choosing which _existing_ revision you want to use on the merged revision. This
is often the case for subrepos that contain binary dependencies (such as DLLs,
etc).
This new prompt makes mercurial better cope with those common scenarios.
Notes:
- The default behavior (which is the one that is used when ui is not
interactive) remains unchanged (i.e. merge is the default action).
- This prompt will be shown even if the ui --tool flag is set.
- I don't know of a way to test the "keep local" and "keep remote" options (i.e.
to force the test to choose those options).
2013-09-06 02:38:28 +04:00
|
|
|
subrepository s diverged (local revision: 3, remote revision: 2)
|
2016-10-08 11:25:28 +03:00
|
|
|
(M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
|
2011-02-09 12:53:09 +03:00
|
|
|
subrepository sources for s differ (in checked out version)
|
2014-10-01 03:08:17 +04:00
|
|
|
use (l)ocal source (1) or (r)emote source (2)? l
|
2011-02-09 12:53:09 +03:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg id -n
|
|
|
|
1+
|
|
|
|
$ cd s
|
|
|
|
$ svnversion
|
|
|
|
1
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
Sticky subrepository, file changes and revision updates
|
|
|
|
$ touch s/f1
|
|
|
|
$ cd s
|
|
|
|
$ svn add f1
|
|
|
|
A f1
|
|
|
|
$ svnversion
|
|
|
|
1M
|
|
|
|
$ cd ..
|
|
|
|
$ hg id -n
|
|
|
|
1+
|
|
|
|
$ hg update tip
|
merge: let the user choose to merge, keep local or keep remote subrepo revisions
When a subrepo has changed on the local and remote revisions, prompt the user
whether it wants to merge those subrepo revisions, keep the local revision or
keep the remote revision.
Up until now mercurial would always perform a merge on a subrepo that had
changed on the local and the remote revisions. This is often inconvenient. For
example:
- You may want to perform the actual subrepo merge after you have merged the
parent subrepo files.
- Some subrepos may be considered "read only", in the sense that you are not
supposed to add new revisions to them. In those cases "merging a subrepo" means
choosing which _existing_ revision you want to use on the merged revision. This
is often the case for subrepos that contain binary dependencies (such as DLLs,
etc).
This new prompt makes mercurial better cope with those common scenarios.
Notes:
- The default behavior (which is the one that is used when ui is not
interactive) remains unchanged (i.e. merge is the default action).
- This prompt will be shown even if the ui --tool flag is set.
- I don't know of a way to test the "keep local" and "keep remote" options (i.e.
to force the test to choose those options).
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1378420708 -7200
# Fri Sep 06 00:38:28 2013 +0200
# Node ID 2fb9cb0c7b26303ac3178b7739975e663075857d
# Parent 796d34e1b749b79834321ef1181ed8433a5515d9
merge: let the user choose to merge, keep local or keep remote subrepo revisions
When a subrepo has changed on the local and remote revisions, prompt the user
whether it wants to merge those subrepo revisions, keep the local revision or
keep the remote revision.
Up until now mercurial would always perform a merge on a subrepo that had
changed on the local and the remote revisions. This is often inconvenient. For
example:
- You may want to perform the actual subrepo merge after you have merged the
parent subrepo files.
- Some subrepos may be considered "read only", in the sense that you are not
supposed to add new revisions to them. In those cases "merging a subrepo" means
choosing which _existing_ revision you want to use on the merged revision. This
is often the case for subrepos that contain binary dependencies (such as DLLs,
etc).
This new prompt makes mercurial better cope with those common scenarios.
Notes:
- The default behavior (which is the one that is used when ui is not
interactive) remains unchanged (i.e. merge is the default action).
- This prompt will be shown even if the ui --tool flag is set.
- I don't know of a way to test the "keep local" and "keep remote" options (i.e.
to force the test to choose those options).
2013-09-06 02:38:28 +04:00
|
|
|
subrepository s diverged (local revision: 3, remote revision: 3)
|
2016-10-08 11:25:28 +03:00
|
|
|
(M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
|
2011-02-09 12:53:09 +03:00
|
|
|
subrepository sources for s differ
|
2014-10-01 03:08:17 +04:00
|
|
|
use (l)ocal source (1) or (r)emote source (3)? l
|
2011-02-09 12:53:09 +03:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg id -n
|
2012-07-27 15:56:19 +04:00
|
|
|
2+
|
2011-02-09 12:53:09 +03:00
|
|
|
$ cd s
|
|
|
|
$ svnversion
|
|
|
|
1M
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
Sticky repository, update --clean
|
2012-06-23 20:54:08 +04:00
|
|
|
$ hg update --clean tip | grep -v 's[/\]externals[/\]other'
|
2011-12-02 19:50:48 +04:00
|
|
|
U *s/alpha (glob)
|
|
|
|
U *s (glob)
|
2011-02-09 12:53:09 +03:00
|
|
|
|
2011-12-02 19:50:48 +04:00
|
|
|
Fetching external item into '*s/externals'* (glob)
|
2011-02-09 12:53:09 +03:00
|
|
|
Checked out external at revision 1.
|
|
|
|
|
|
|
|
Checked out revision 3.
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg id -n
|
|
|
|
2
|
|
|
|
$ cd s
|
|
|
|
$ svnversion
|
|
|
|
3
|
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
Test subrepo already at intended revision:
|
|
|
|
$ cd s
|
2011-12-02 19:50:48 +04:00
|
|
|
$ svn update -qr 2
|
2011-02-09 12:53:09 +03:00
|
|
|
$ cd ..
|
|
|
|
$ hg update 1
|
merge: let the user choose to merge, keep local or keep remote subrepo revisions
When a subrepo has changed on the local and remote revisions, prompt the user
whether it wants to merge those subrepo revisions, keep the local revision or
keep the remote revision.
Up until now mercurial would always perform a merge on a subrepo that had
changed on the local and the remote revisions. This is often inconvenient. For
example:
- You may want to perform the actual subrepo merge after you have merged the
parent subrepo files.
- Some subrepos may be considered "read only", in the sense that you are not
supposed to add new revisions to them. In those cases "merging a subrepo" means
choosing which _existing_ revision you want to use on the merged revision. This
is often the case for subrepos that contain binary dependencies (such as DLLs,
etc).
This new prompt makes mercurial better cope with those common scenarios.
Notes:
- The default behavior (which is the one that is used when ui is not
interactive) remains unchanged (i.e. merge is the default action).
- This prompt will be shown even if the ui --tool flag is set.
- I don't know of a way to test the "keep local" and "keep remote" options (i.e.
to force the test to choose those options).
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1378420708 -7200
# Fri Sep 06 00:38:28 2013 +0200
# Node ID 2fb9cb0c7b26303ac3178b7739975e663075857d
# Parent 796d34e1b749b79834321ef1181ed8433a5515d9
merge: let the user choose to merge, keep local or keep remote subrepo revisions
When a subrepo has changed on the local and remote revisions, prompt the user
whether it wants to merge those subrepo revisions, keep the local revision or
keep the remote revision.
Up until now mercurial would always perform a merge on a subrepo that had
changed on the local and the remote revisions. This is often inconvenient. For
example:
- You may want to perform the actual subrepo merge after you have merged the
parent subrepo files.
- Some subrepos may be considered "read only", in the sense that you are not
supposed to add new revisions to them. In those cases "merging a subrepo" means
choosing which _existing_ revision you want to use on the merged revision. This
is often the case for subrepos that contain binary dependencies (such as DLLs,
etc).
This new prompt makes mercurial better cope with those common scenarios.
Notes:
- The default behavior (which is the one that is used when ui is not
interactive) remains unchanged (i.e. merge is the default action).
- This prompt will be shown even if the ui --tool flag is set.
- I don't know of a way to test the "keep local" and "keep remote" options (i.e.
to force the test to choose those options).
2013-09-06 02:38:28 +04:00
|
|
|
subrepository s diverged (local revision: 3, remote revision: 2)
|
2016-10-08 11:25:28 +03:00
|
|
|
(M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
|
2011-02-09 12:53:09 +03:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ hg id -n
|
|
|
|
1+
|
|
|
|
$ cd s
|
|
|
|
$ svnversion
|
|
|
|
2
|
|
|
|
$ cd ..
|
2011-03-04 16:00:49 +03:00
|
|
|
|
|
|
|
Test case where subversion would fail to update the subrepo because there
|
|
|
|
are unknown directories being replaced by tracked ones (happens with rebase).
|
|
|
|
|
2012-06-26 05:35:22 +04:00
|
|
|
$ cd "$WCROOT/src"
|
2011-03-04 16:00:49 +03:00
|
|
|
$ mkdir dir
|
|
|
|
$ echo epsilon.py > dir/epsilon.py
|
|
|
|
$ svn add dir
|
|
|
|
A dir
|
2012-06-23 20:54:08 +04:00
|
|
|
A dir/epsilon.py (glob)
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn ci -qm 'Add dir/epsilon.py'
|
2011-03-04 16:00:49 +03:00
|
|
|
$ cd ../..
|
|
|
|
$ hg init rebaserepo
|
|
|
|
$ cd rebaserepo
|
2012-06-26 05:35:22 +04:00
|
|
|
$ svn co -r5 --quiet "$SVNREPOURL"/src s
|
|
|
|
$ echo "s = [svn] $SVNREPOURL/src" >> .hgsub
|
2011-03-04 16:00:49 +03:00
|
|
|
$ hg add .hgsub
|
|
|
|
$ hg ci -m addsub
|
|
|
|
$ echo a > a
|
2015-01-28 04:57:43 +03:00
|
|
|
$ hg add .
|
2011-03-04 16:00:49 +03:00
|
|
|
adding a
|
2015-01-28 04:57:43 +03:00
|
|
|
$ hg ci -m adda
|
2011-03-04 16:00:49 +03:00
|
|
|
$ hg up 0
|
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2011-12-02 19:50:48 +04:00
|
|
|
$ svn up -qr6 s
|
2011-03-04 16:00:49 +03:00
|
|
|
$ hg ci -m updatesub
|
|
|
|
created new head
|
|
|
|
$ echo pyc > s/dir/epsilon.pyc
|
|
|
|
$ hg up 1
|
2011-12-02 19:50:48 +04:00
|
|
|
D *s/dir (glob)
|
2011-03-04 16:00:49 +03:00
|
|
|
|
2011-12-02 19:50:48 +04:00
|
|
|
Fetching external item into '*s/externals'* (glob)
|
2011-03-04 16:00:49 +03:00
|
|
|
Checked out external at revision 1.
|
|
|
|
|
|
|
|
Checked out revision 5.
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-06-10 15:01:40 +04:00
|
|
|
$ hg up -q 2
|
2011-06-18 00:22:50 +04:00
|
|
|
|
|
|
|
Modify one of the externals to point to a different path so we can
|
|
|
|
test having obstructions when switching branches on checkout:
|
|
|
|
$ hg checkout tip
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2012-06-26 05:35:22 +04:00
|
|
|
$ echo "obstruct = [svn] $SVNREPOURL/externals" >> .hgsub
|
|
|
|
$ svn co -r5 --quiet "$SVNREPOURL"/externals obstruct
|
2011-10-28 02:22:04 +04:00
|
|
|
$ hg commit -m 'Start making obstructed working copy'
|
2011-06-18 00:22:50 +04:00
|
|
|
$ hg book other
|
|
|
|
$ hg co -r 'p1(tip)'
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2014-05-14 23:49:55 +04:00
|
|
|
(leaving bookmark other)
|
2012-06-26 05:35:22 +04:00
|
|
|
$ echo "obstruct = [svn] $SVNREPOURL/src" >> .hgsub
|
|
|
|
$ svn co -r5 --quiet "$SVNREPOURL"/src obstruct
|
2011-06-18 00:22:50 +04:00
|
|
|
$ hg commit -m 'Other branch which will be obstructed'
|
|
|
|
created new head
|
|
|
|
|
|
|
|
Switching back to the head where we have another path mapped to the
|
|
|
|
same subrepo should work if the subrepo is clean.
|
|
|
|
$ hg co other
|
2011-12-02 19:50:48 +04:00
|
|
|
A *obstruct/other (glob)
|
2011-06-18 00:22:50 +04:00
|
|
|
Checked out revision 1.
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2013-03-07 07:17:56 +04:00
|
|
|
(activating bookmark other)
|
2011-06-18 00:22:50 +04:00
|
|
|
|
|
|
|
This is surprising, but is also correct based on the current code:
|
|
|
|
$ echo "updating should (maybe) fail" > obstruct/other
|
|
|
|
$ hg co tip
|
2013-09-24 07:07:30 +04:00
|
|
|
abort: uncommitted changes
|
|
|
|
(commit or update --clean to discard changes)
|
2011-06-18 00:22:50 +04:00
|
|
|
[255]
|
2011-06-30 22:22:12 +04:00
|
|
|
|
|
|
|
Point to a Subversion branch which has since been deleted and recreated
|
|
|
|
First, create that condition in the repository.
|
|
|
|
|
2015-09-26 09:20:32 +03:00
|
|
|
$ hg ci --subrepos -m cleanup | filter_svn_output
|
2011-06-30 22:22:12 +04:00
|
|
|
committing subrepository obstruct
|
2012-06-23 20:54:08 +04:00
|
|
|
Sending obstruct/other (glob)
|
2011-06-30 22:22:12 +04:00
|
|
|
Committed revision 7.
|
|
|
|
At revision 7.
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn mkdir -qm "baseline" $SVNREPOURL/trunk
|
|
|
|
$ svn copy -qm "initial branch" $SVNREPOURL/trunk $SVNREPOURL/branch
|
2012-06-26 05:35:22 +04:00
|
|
|
$ svn co --quiet "$SVNREPOURL"/branch tempwc
|
2011-06-30 22:22:12 +04:00
|
|
|
$ cd tempwc
|
|
|
|
$ echo "something old" > somethingold
|
|
|
|
$ svn add somethingold
|
|
|
|
A somethingold
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn ci -qm 'Something old'
|
|
|
|
$ svn rm -qm "remove branch" $SVNREPOURL/branch
|
|
|
|
$ svn copy -qm "recreate branch" $SVNREPOURL/trunk $SVNREPOURL/branch
|
2011-12-02 19:50:48 +04:00
|
|
|
$ svn up -q
|
2011-06-30 22:22:12 +04:00
|
|
|
$ echo "something new" > somethingnew
|
|
|
|
$ svn add somethingnew
|
|
|
|
A somethingnew
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn ci -qm 'Something new'
|
2011-06-30 22:22:12 +04:00
|
|
|
$ cd ..
|
|
|
|
$ rm -rf tempwc
|
2012-06-26 05:35:22 +04:00
|
|
|
$ svn co "$SVNREPOURL/branch"@10 recreated
|
2012-06-23 20:54:08 +04:00
|
|
|
A recreated/somethingold (glob)
|
2011-06-30 22:22:12 +04:00
|
|
|
Checked out revision 10.
|
2012-06-26 05:35:22 +04:00
|
|
|
$ echo "recreated = [svn] $SVNREPOURL/branch" >> .hgsub
|
2011-06-30 22:22:12 +04:00
|
|
|
$ hg ci -m addsub
|
|
|
|
$ cd recreated
|
2011-12-02 19:50:48 +04:00
|
|
|
$ svn up -q
|
2011-06-30 22:22:12 +04:00
|
|
|
$ cd ..
|
|
|
|
$ hg ci -m updatesub
|
|
|
|
$ hg up -r-2
|
2011-12-02 19:50:48 +04:00
|
|
|
D *recreated/somethingnew (glob)
|
|
|
|
A *recreated/somethingold (glob)
|
2011-06-30 22:22:12 +04:00
|
|
|
Checked out revision 10.
|
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2014-05-14 23:49:55 +04:00
|
|
|
(leaving bookmark other)
|
2011-10-17 02:11:56 +04:00
|
|
|
$ test -f recreated/somethingold
|
2011-06-30 22:22:12 +04:00
|
|
|
|
2012-04-16 13:48:15 +04:00
|
|
|
Test archive
|
|
|
|
|
2015-05-10 09:40:40 +03:00
|
|
|
$ hg archive -S ../archive-all --debug --config progress.debug=true
|
2012-04-16 13:48:15 +04:00
|
|
|
archiving: 0/2 files (0.00%)
|
|
|
|
archiving: .hgsub 1/2 files (50.00%)
|
|
|
|
archiving: .hgsubstate 2/2 files (100.00%)
|
|
|
|
archiving (obstruct): 0/1 files (0.00%)
|
|
|
|
archiving (obstruct): 1/1 files (100.00%)
|
2012-12-12 05:38:14 +04:00
|
|
|
archiving (recreated): 0/1 files (0.00%)
|
|
|
|
archiving (recreated): 1/1 files (100.00%)
|
2012-04-16 13:48:15 +04:00
|
|
|
archiving (s): 0/2 files (0.00%)
|
|
|
|
archiving (s): 1/2 files (50.00%)
|
|
|
|
archiving (s): 2/2 files (100.00%)
|
2012-04-27 13:02:16 +04:00
|
|
|
|
2015-05-10 09:40:40 +03:00
|
|
|
$ hg archive -S ../archive-exclude --debug --config progress.debug=true -X **old
|
2012-06-17 06:34:06 +04:00
|
|
|
archiving: 0/2 files (0.00%)
|
|
|
|
archiving: .hgsub 1/2 files (50.00%)
|
|
|
|
archiving: .hgsubstate 2/2 files (100.00%)
|
|
|
|
archiving (obstruct): 0/1 files (0.00%)
|
|
|
|
archiving (obstruct): 1/1 files (100.00%)
|
2012-12-12 05:38:14 +04:00
|
|
|
archiving (recreated): 0 files
|
2012-06-17 06:34:06 +04:00
|
|
|
archiving (s): 0/2 files (0.00%)
|
|
|
|
archiving (s): 1/2 files (50.00%)
|
|
|
|
archiving (s): 2/2 files (100.00%)
|
|
|
|
$ find ../archive-exclude | sort
|
|
|
|
../archive-exclude
|
|
|
|
../archive-exclude/.hg_archival.txt
|
|
|
|
../archive-exclude/.hgsub
|
|
|
|
../archive-exclude/.hgsubstate
|
|
|
|
../archive-exclude/obstruct
|
|
|
|
../archive-exclude/obstruct/other
|
|
|
|
../archive-exclude/s
|
|
|
|
../archive-exclude/s/alpha
|
|
|
|
../archive-exclude/s/dir
|
|
|
|
../archive-exclude/s/dir/epsilon.py
|
|
|
|
|
2012-04-27 13:02:16 +04:00
|
|
|
Test forgetting files, not implemented in svn subrepo, used to
|
|
|
|
traceback
|
|
|
|
|
2012-06-23 20:54:08 +04:00
|
|
|
#if no-windows
|
2012-04-27 13:02:16 +04:00
|
|
|
$ hg forget 'notafile*'
|
|
|
|
notafile*: No such file or directory
|
|
|
|
[1]
|
2012-06-23 20:54:08 +04:00
|
|
|
#else
|
|
|
|
$ hg forget 'notafile'
|
|
|
|
notafile: * (glob)
|
|
|
|
[1]
|
|
|
|
#endif
|
2012-04-30 19:03:15 +04:00
|
|
|
|
|
|
|
Test a subrepo referencing a just moved svn path. Last commit rev will
|
|
|
|
be different from the revision, and the path will be different as
|
|
|
|
well.
|
|
|
|
|
2012-06-26 05:35:22 +04:00
|
|
|
$ cd "$WCROOT"
|
2012-04-30 19:03:15 +04:00
|
|
|
$ svn up > /dev/null
|
|
|
|
$ mkdir trunk/subdir branches
|
|
|
|
$ echo a > trunk/subdir/a
|
|
|
|
$ svn add trunk/subdir branches
|
2012-06-23 20:54:08 +04:00
|
|
|
A trunk/subdir (glob)
|
|
|
|
A trunk/subdir/a (glob)
|
2012-04-30 19:03:15 +04:00
|
|
|
A branches
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn ci -qm addsubdir
|
|
|
|
$ svn cp -qm branchtrunk $SVNREPOURL/trunk $SVNREPOURL/branches/somebranch
|
2012-04-30 19:03:15 +04:00
|
|
|
$ cd ..
|
|
|
|
|
|
|
|
$ hg init repo2
|
|
|
|
$ cd repo2
|
2012-06-26 05:35:22 +04:00
|
|
|
$ svn co $SVNREPOURL/branches/somebranch/subdir
|
2012-06-23 20:54:08 +04:00
|
|
|
A subdir/a (glob)
|
2012-04-30 19:03:15 +04:00
|
|
|
Checked out revision 15.
|
2012-06-26 05:35:22 +04:00
|
|
|
$ echo "subdir = [svn] $SVNREPOURL/branches/somebranch/subdir" > .hgsub
|
2012-04-30 19:03:15 +04:00
|
|
|
$ hg add .hgsub
|
|
|
|
$ hg ci -m addsub
|
|
|
|
$ hg up null
|
|
|
|
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
|
|
|
|
$ hg up
|
|
|
|
A *subdir/a (glob)
|
|
|
|
Checked out revision 15.
|
|
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd ..
|
2014-05-08 14:03:00 +04:00
|
|
|
|
|
|
|
Test sanitizing ".hg/hgrc" in subrepo
|
|
|
|
|
|
|
|
$ cd sub/t
|
|
|
|
$ hg update -q -C tip
|
|
|
|
$ cd s
|
|
|
|
$ mkdir .hg
|
|
|
|
$ echo '.hg/hgrc in svn repo' > .hg/hgrc
|
|
|
|
$ mkdir -p sub/.hg
|
|
|
|
$ echo 'sub/.hg/hgrc in svn repo' > sub/.hg/hgrc
|
|
|
|
$ svn add .hg sub
|
|
|
|
A .hg
|
|
|
|
A .hg/hgrc (glob)
|
|
|
|
A sub
|
|
|
|
A sub/.hg (glob)
|
|
|
|
A sub/.hg/hgrc (glob)
|
2015-09-26 09:20:32 +03:00
|
|
|
$ svn ci -qm 'add .hg/hgrc to be sanitized at hg update'
|
2014-05-08 14:03:00 +04:00
|
|
|
$ svn up -q
|
|
|
|
$ cd ..
|
|
|
|
$ hg commit -S -m 'commit with svn revision including .hg/hgrc'
|
|
|
|
$ grep ' s$' .hgsubstate
|
|
|
|
16 s
|
|
|
|
$ cd ..
|
|
|
|
|
2014-05-08 14:03:00 +04:00
|
|
|
$ hg -R tc pull -u -q 2>&1 | sort
|
|
|
|
warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/.hg' (glob)
|
|
|
|
warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/sub/.hg' (glob)
|
2014-05-08 14:03:00 +04:00
|
|
|
$ cd tc
|
|
|
|
$ grep ' s$' .hgsubstate
|
|
|
|
16 s
|
2014-07-21 22:27:24 +04:00
|
|
|
$ test -f s/.hg/hgrc
|
2014-05-08 14:03:00 +04:00
|
|
|
[1]
|
2014-07-21 22:27:24 +04:00
|
|
|
$ test -f s/sub/.hg/hgrc
|
2014-05-08 14:03:00 +04:00
|
|
|
[1]
|
|
|
|
|
2014-05-08 14:03:00 +04:00
|
|
|
Test that sanitizing is omitted in meta data area:
|
|
|
|
|
|
|
|
$ mkdir s/.svn/.hg
|
|
|
|
$ echo '.hg/hgrc in svn metadata area' > s/.svn/.hg/hgrc
|
|
|
|
$ hg update -q -C '.^1'
|
|
|
|
|
2014-05-08 14:03:00 +04:00
|
|
|
$ cd ../..
|