Re: [Monotone-devel] Strange behaviour when syncing

2005-06-21 Thread Nathaniel Smith
On Tue, Jun 21, 2005 at 03:47:01PM +1000, Robert Leftwich wrote: > A simple: > > monotone: already up to date at 56ece60be1a574b54f7e130cd0caf60ed0811ef5 > BUT - unmerged heads exists > > would be sufficient. And, thanks to Jeremy Cowgar, already implemented in 0.19 ;-). (Similarly, 0

Re: [Monotone-devel] Strange behaviour when syncing

2005-06-20 Thread Robert Leftwich
Julio M. Merino Vidal wrote: My guess is that your code diverged at some point and you created two different heads. Try 'monotone heads' and see if there is more than one; if so, just run 'monotone merge' to merge them. That was it, thanks. I was sure I had run 'monotone head' when it first

Re: [Monotone-devel] Strange behaviour when syncing

2005-06-20 Thread Julio M. Merino Vidal
On Mon, 2005-06-20 at 22:51 +1000, Robert Leftwich wrote: > I've been using monotone for a while on my personal projects without a > problem. > My setup is that I dual boot my laptop between linux (ubuntu) and xp, both of > which run monotone 0.18. A w2000 box also runs monotone 0.18 using the

[Monotone-devel] Strange behaviour when syncing

2005-06-20 Thread Robert Leftwich
I've been using monotone for a while on my personal projects without a problem. My setup is that I dual boot my laptop between linux (ubuntu) and xp, both of which run monotone 0.18. A w2000 box also runs monotone 0.18 using the serve option and acts as a central repository. My normal mode of o