On Thu, Dec 9, 2010 at 12:51 PM, vila <<a href="mailto:v.ladeuil%2Blp@free.fr">v.ladeuil+lp@free.fr</a>> wrote: <div class="gmail_quote"><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> >>>>> Andrew S Townley <<a href="mailto:ast@atownley.org">ast@atownley.org</a>> 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). </blockquote><div> 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 </div></div>-- Marco Pantaleoni