[PATCH] merge: handle case when heads are all bookmarks

[Kevin Bullock]

On Aug 27, 2012, at 9:00 AM, John Li wrote:

> On Fri, Aug 24, 2012 at 10:56:03AM +0200, Mads Kiilerich wrote:
>> I guess that was a very subtle hint:
>> John, please add a test for this case to the test suite.
> 
> Ah, sure thing. I extended test-bookmarks-merge.t. (Is it okay to send
> a patch inline, or should I send a separate message?)
> 
> # HG changeset patch
> # User John Li <jli at circularly.org>
> # Date 1346075878 14400
> # Node ID a3e550fee75251841da36cdbb27959c47f169eeb
> # Parent  99a2a4ae35e2180b7f825ef2677c36d538eac4ba
> tests: merging bookmarked heads
> 
> 45b5eb2941d0 fixed an error that occured when heads being merged were both
> inactive bookmarks. Add a test for that case.

Looks good in principle, but for some reason I get whitespace weirdness on the output:

❧  make test-bookmarks-merge.t
cd tests && python run-tests.py  test-bookmarks-merge.t

--- /Users/kbullock/Source/Upstream/hg/hg/tests/test-bookmarks-merge.t
+++ /Users/kbullock/Source/Upstream/hg/hg/tests/test-bookmarks-merge.t.err
@@ -113,7 +113,7 @@
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     g
-
+  
   changeset:   7:ca784329f0ba
   bookmark:    e
   parent:      5:26bee9c5bcf3
@@ -121,6 +121,8 @@
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merge
+  
+
 
   $ hg merge
   abort: heads are bookmarked - please merge with an explicit rev

ERROR: /Users/kbullock/Source/Upstream/hg/hg/tests/test-bookmarks-merge.t output changed
!
Failed test-bookmarks-merge.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
make: *** [test-bookmarks-merge.t] Error 1

It's entirely possible that this is the fault of copying and pasting from Apple Mail.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock