Re: [Monotone-devel] info during merge on files dropped on one side receiving changes on the other side?

[Marcel van der Boom]

On 13 jul 2006, at 19:20, Nathaniel Smith wrote:

> On Thu, Jul 13, 2006 at 04:38:50PM +0200, Marcel van der Boom wrote:
> > mtn: warning: restriction excludes directory 'blah/blah/1'
> > mtn: warning: restriction excludes directory 'blah/blah/2'
> > ....
> > mtn: misuse: invalid restriction excludes required directories
>
> This seems weird.  Could you give more details on what exactly you
> did?  A reproducible test case would be especially nice :-).

I dont have a minimal test case right now, but

mtn diff -f -r `mtn automate heads com.xaraya.core` -r `mtn automate  
heads com.xaraya.core.2.x'

from the current core.db of xaraya will produce one.

> > $mtn propagate one two
> > mtn: propagating one -> two
> > mtn: [source] 9ea04ac3c5931d8be40cc3da634708c793b017c4
> > mtn: [target] 4c48584b4c452245b4ec0fa788f49fb1b16e5d5c
> > mtn: info: file /path/to/onlyhere.txt changed in 'one' but dropped in
> > 'two'
> > mtn: info: file /another/file.txt changed in 'one' but renamed in
> > 'two' to /something/else.txt
> > mtn: info: file /again/nothere.txt changed in 'one' but renamed and
> > dropped thereafter in 'two'
> > mtn: [merged] 3a778819764ea9045b8640eee78ae4d4bb61a9dc
> > $

> Could you file a bug so we don't forget?
I will. (how's the plan on replacing that savanah bugtracker coming  
along ;-) )

> Also, what kinds of changes are worth warning about?  Content,
> obviously, but what if it's been renamed on one side and deleted on
> the other, or had an attr modified on one side but deleted on the
> other, are those worth warning about?
attr changes are less relevant i think. The 'generic' case is that in  
refactoring code you move files around, give them better names, split  
them up, move classes to other files etc. All this generates 'native'  
conflicts as monotone understands them but, more hair-pulling if you  
want to track both repositories and on both sides there is active  
development,: "what consequences does this have in terms of what i  
need to do after i get these natives out of the way"

So yeah, renamed/deleted is one, any content change in files which do  
not exist in the destination (be it due to renaming or deletion),  
adding files (taken care of already). The combo's described in the  
manual come to mind (what was it again, mtn automate inventory?) as a  
baseline to start from and reason from there.

marcel

--
Marcel van der Boom
HS-Development BV               --   http://www.hsdev.com
So! webapplicatie framework  --   http://make-it-so.info

smime.p7s
Description: S/MIME cryptographic signature