[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] info during merge on files dropped on one side rece
From: |
Marcel van der Boom |
Subject: |
Re: [Monotone-devel] info during merge on files dropped on one side receiving changes on the other side? |
Date: |
Thu, 13 Jul 2006 16:38:50 +0200 |
On 13 jul 2006, at 15:11, Richard Levitte - VMS Whacker wrote:
marcel> In practice this all happens in silence. It would be
comfortable to
marcel> be able to break that silence somehow, either by letting
the merge
marcel> output something informational, or having a way to list the
files
marcel> which were dropped in 'two' and thus will not receive any
changes
marcel> from 'one' on them.
mtn diff -r `mtn automate heads one` -r `mtn automate heads two`
The heading should tell you that a file was dropped on the way
somewhere.
Yeah, this is _sometimes_ a solution. Sometimes, because it's not
always possible to construct such output apparently. In our case for
example the msg appears:
mtn: warning: restriction excludes directory 'blah/blah/1'
mtn: warning: restriction excludes directory 'blah/blah/2'
....
mtn: misuse: invalid restriction excludes required directories
I was thinking more in terms of something like:
$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
$
and similar in 'mtn show_conflicts' output i guess. Not sure if the
last two info lines make sense though. Such output would save a lot
of time, since it spits out the filenames to investigate manually for
the 'functional' changes in branch 'two' versus 'one' which monotone
cannot determine by itself.
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