interrupting a merge session

[Samuel Hart]

On Wed, 13 Jun 2007, Mike Kupfer wrote:

> For Solaris development it's not unusual for large projects to need to
> merge several files after pulling from the main "gate" repository.  And
> it's not unusual to want to do the merge in multiple sessions.  For
> example, start merging at the office, and finish merging at home.  Or
> have one person do most of the merges, but have a second person do
> particularly tricky merges in his or her area of expertise.

It seems to me that a logical way to do something similar to this would be 
via .hgignore, e.g. after your edits before your merge you enumerate those 
files you want merge to ignore in .hgignore and then letter remove them 
again when you want to handle their merges.

Unfortunately, it doesn't work this way... I'm just suggesting that *if it 
did* it would be a logical (in my mind) way to go.

----
Sam Hart - http://samhart.com/ - http://samhart.net/