Conflicts due to independently creating identical files

[Marco Pantaleoni]

On Thu, Dec 9, 2010 at 12:51 PM, vila
<v.ladeuil+lp at free.fr<v.ladeuil%2Blp at free.fr>
> wrote:

> >>>>> Andrew S Townley <ast at atownley.org> writes:
>
> If you maintain the trees yourself, you may want to resync their
> histories too, that would get rid of the conflicts entirely. Also using
> Unison (based on rsync right ?) should not give better results than 'bzr
> pull' (especially if you use the recommended stable 2a format).
>

afaik unison is not based on rsync: rsync is unidirectional, while unison is
bidirectional.
I wonder if unison could be used to keep synchronized a selection of machine
specific branches contained in shared repositories. Suppose a shared
repository 'repo' is laid out as in:

repo/
repo/trunk
repo/dev
repo/machine_a/trunk
repo/machine_a/dev
repo/machine_b/trunk
repo/machine_b/dev

could I just keep synchronized (across machine A and machine B) with unison
the repo/machine_a/* and repo/machine_b/* branches? Would it work?
(the idea is that on machine A one works only with repo/machine_a/* and on
machine B only with repo/machine_b/*)

Cheers,
Marco

-- 
Marco Pantaleoni
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20101222/82bba97d/attachment.htm