monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-devel] 'monotone log' gives, eh, interesting results...


From: Richard Levitte - VMS Whacker
Subject: [Monotone-devel] 'monotone log' gives, eh, interesting results...
Date: Fri, 13 Jan 2006 00:25:48 +0100 (CET)

This is a bit of an edge case :-)

I understand that on the bleeding edge, monotone log doesn't show
merges any more.  In some cases, the result is a bit...  interesting!

] : ; monotone-0.26pre1 log -r 817eddb284f82ffb8b4b5db11540f69495e4d64e --last=1
] -----------------------------------------------------------------
] Revision: 9b294cf172a0938323ccb94ab47a4e835b9f0a11
] Ancestor: 3ff97389cbbba822c109c78cb4380d64f960f54c
] Author: address@hidden
] Date: 2006-01-11T05:07:22
] Branch: net.venge.monotone
] 
] Modified files:
]         ChangeLog packet.cc
] 
] ChangeLog: 
] 
] 2006-01-10  Nathaniel Smith  <address@hidden>
] 
]         * packet.cc (packet_roundabout_test): Test rdata packets too.
] 
] -----------------------------------------------------------------
] Revision: c53902afc748d38b15fb2b43743fe924a3d0df85
] Ancestor: 3cbb0756d9690727c9cc8f605789815ce3d4ba84
] Author: address@hidden
] Date: 2006-01-11T05:22:42
] Branch: net.venge.monotone
] 
] Added files:
]         tests/t_revert_ignored.at
] Modified files:
]         ChangeLog testsuite.at
] 
] ChangeLog: 
] 
] 2006-01-10  Derek Scherger  <address@hidden>
] 
]         * tests/t_revert_unchanged.at: new test to check that reverting
]         nothing but unchanged files doesn't end up with an empty
]         restriction and revert everything
]         * testsuite.at: call it
] 

Of course, I can understand very much why this happens.  It is a bit
surprising on the unsuspecting "victim" though, and it took me a few
moments to realise that "--merges" is a good thing to add.

Anyway, I'm not really sure what to do with this, but this was at
least good for a laugh :-).

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]