--- a/tests/test-subrepo-git.t Tue Sep 24 15:10:32 2013 -0400
+++ b/tests/test-subrepo-git.t Fri Sep 06 00:38:28 2013 +0200
@@ -155,6 +155,8 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge 2>/dev/null
+ subrepository s diverged (local revision: 796959400868, remote revision: aa84837ccfbd)
+ (M)erge, keep (l)ocal or keep (r)emote? m
pulling subrepo s from $TESTTMP/gitroot
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -462,6 +464,8 @@
da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7
$ cd ..
$ hg update 4
+ subrepository s diverged (local revision: da5f5b1d8ffc, remote revision: aa84837ccfbd)
+ (M)erge, keep (l)ocal or keep (r)emote? m
subrepository sources for s differ
use (l)ocal source (da5f5b1) or (r)emote source (aa84837)?
l
@@ -487,6 +491,8 @@
HEAD is now at aa84837... f
$ cd ..
$ hg update 1
+ subrepository s diverged (local revision: 32a343883b74, remote revision: da5f5b1d8ffc)
+ (M)erge, keep (l)ocal or keep (r)emote? m
subrepository sources for s differ (in checked out version)
use (l)ocal source (32a3438) or (r)emote source (da5f5b1)?
l
@@ -508,6 +514,8 @@
$ hg id -n
1+
$ hg update 7
+ subrepository s diverged (local revision: 32a343883b74, remote revision: 32a343883b74)
+ (M)erge, keep (l)ocal or keep (r)emote? m
subrepository sources for s differ
use (l)ocal source (32a3438) or (r)emote source (32a3438)?
l