# HG changeset patch # User Kevin Bullock # Date 2013-02-21 21:05:06 # Node ID 2e5476980a57657e7ed252c56b62a289031530ca # Parent 1163ff06ce897e6be7b336f535b29d47449418c6 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. diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t --- a/tests/test-subrepo-git.t +++ b/tests/test-subrepo-git.t @@ -253,6 +253,7 @@ pulling new git branch should not create (issue3870) $ cd ../td/s $ git remote set-url origin $TESTTMP/tb/s + $ git branch --no-track oldtesting $ cd .. $ hg pull -q ../tb $ hg up