Behavior Difference Between unbundle and import --exact

Kevin Christen kevin.christen at gmail.com
Mon Jul 14 10:56:12 CDT 2008


I'm trying to test a workflow for a team who's members can't all pull from
the "gold copy" repository (don't ask...).  I've tried two different
approachs: sending the gold copy updates out as bundles, and sending them
out as patches to be imported with the --exact option.  The bundle approach
works fine, but the import approach fails when importing a merge changeset
with this message:

abort: cannot partially commit a merge (do not specify files or patterns)

The attached script demonstrates: run it as-is to see the failure, and
comment out line 2 ("export=1") to run it successfully using
bundle/unbundle.

I have two questions: what does the error message mean, and am I wrong to
expect that bundle/unbundle and export/import --exact work similarly?

This is with 1.0.1.

Thanks,
Kevin Christen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20080714/5c99eb7c/attachment.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: test.sh
Type: application/x-sh
Size: 2760 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20080714/5c99eb7c/attachment.sh 


More information about the Mercurial mailing list