[PATCH] push: fix subtle bug in prepush logic

[Adrian Buehlmann]

On 17.10.2009 15:43, Henrik Stuart wrote:
> On Sat, 17 Oct 2009, Adrian Buehlmann wrote:
> 
>> [cc-ing Sune]
>>
>> This has been pushed as f3569d95c2ab, but I found a surprising change here
>> in test-push-warn.out while I was updating it for my "updating to branch ..."
>> patch for clone I'm working on right now (see the thread
>> "status output during clone")
> 
> Nice catch. That was not deliberate, but it doesn't hurt the test as such 
> (the test is still correct). I'll send an updated test version to avoid 
> any future confusion.
> 

Thanks.

The "reused" repo popped up in my patch as (note the line
"updating to branch a"):

diff --git a/tests/test-push-warn.out b/tests/test-push-warn.out
--- a/tests/test-push-warn.out
+++ b/tests/test-push-warn.out
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to ../a
 searching for changes
@@ -24,7 +24,7 @@
 adding file changes
 added 2 changesets with 1 changes to 1 files
 adding foo
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
@@ -128,7 +128,7 @@
 abort: repository g already exists!
 adding init
 adding a
-updating working directory
+updating to branch a
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 adding b


Your fix will most likely change that to "updating to branch default"
as well.