Mercurial > hg

diff tests/test-subrepo-git.t @ 19049:2e5476980a57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: fix test breakage introduced in 2b34d004e644 The test didn't break when I originally committed it (git version 1.7.12.4 (Apple Git-37)), and still doesn't on that machine, but the output changes elsewhere with "Warning: you are leaving N commits behind..." This change sets a ref on the commit we're updating the subrepo _away_ from to quash the warning.
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 21 Feb 2013 21:05:06 +0000
parents 2b34d004e644
children 5e10d41e7b9c
line wrap: on
line diff
--- a/tests/test-subrepo-git.t	Thu Apr 18 15:27:50 2013 +0200
+++ b/tests/test-subrepo-git.t	Thu Feb 21 21:05:06 2013 +0000
@@ -253,6 +253,7 @@
 (issue3870)
   $ cd ../td/s
   $ git remote set-url origin $TESTTMP/tb/s
+  $ git branch --no-track oldtesting
   $ cd ..
   $ hg pull -q ../tb
   $ hg up