Simple usage pattern seems problematic ?

[Arne Babenhauserheide]

Hi, 

On Saturday 22 January 2011 14:52:45 Maxim Veksler wrote:
>    - Developer can't update his local workspace without committing all of
>    his local changes first. Why this constraint exists? The most obvious
> mode where this collides is when you change configuration files for your
> local development... You obviously don't need these changes to be pushed
> into the repository.

You could use an incoming repository, merge there and then pull the merged 
changes into the repository with the changed config files. 

Getting changes: 

	work (commit all but the config files) ⇒ incoming (push or pull there)
	remote (bitbucket) ⇒ incoming (merge) ⇒ work (update)

Uploading changes: 

	work (commit everything except the config files) ⇒ remote (push) 
	on error: repeat getting changes. 

Then updating in the work repo should be no problem, as the files will simply 
be merged on update. 

Best wishes, 
Arne
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 316 bytes
Desc: This is a digitally signed message part.
URL: <http://selenic.com/pipermail/mercurial/attachments/20110122/5258d1f1/attachment.pgp>