From 506e1fa97ede7b60f60fec404a0d63ab4103593d Mon Sep 17 00:00:00 2001 From: "Dr. Peter Poeml" Date: Tue, 23 Jan 2007 07:03:08 +0000 Subject: [PATCH] udpate NEWS file --- NEWS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 8bc96ebc..deca81e7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,9 @@ since 0.9: - +- fix important bug, which could lead to overwriting local modifications when + upstream changes are merged in +- if a merge fails, the store copy must be updated neverthelesss +- fix testsuite and add testcase for successful merging +- sort output of 'status' (unknown files first, filenames alphabetically) - core: added class "metadata" (merge from Susannes /branches/froh/reponator/) - added command alias 'stat' for 'status', like in svn - improved documentation/examples (Lars + Susanne)