[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: |
Richard Levitte - VMS Whacker |
Subject: |
Re: [Monotone-devel] info during merge on files dropped on one side receiving changes on the other side? |
Date: |
Thu, 13 Jul 2006 15:11:53 +0200 (CEST) |
In message <address@hidden> on Thu, 13 Jul 2006 14:51:01 +0200, Marcel van der
Boom <address@hidden> said:
marcel> 2 branches, 'one' and 'two', 'one' propagates to 'two' on a regular
marcel> basis.
marcel> in a distant past file 'onlyhere.txt' was dropped from 'two' thus
marcel> leaving it only in 'one'
marcel> making a change to 'onlyhere.txt' in 'one' doesnt propagate that
marcel> change to 'two'
marcel>
marcel> This is probably correct behaviour, right?
I would say so.
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.
Cheers,
Richard
-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.
--
Richard Levitte address@hidden
http://richard.levitte.org/
"When I became a man I put away childish things, including
the fear of childishness and the desire to be very grown up."
-- C.S. Lewis