Le 5242 Septembre 1993, Sam Steingold a tapoté: > $ bzr remerge > All changes applied successfully. > $ bzr st > unknown: > ~ e21/ > ~ e23/ > ~ info/ > pending merges: > ~ Stefan Reichoer 2008-01-06 Merged the dvc file-info branch from > Stephen L... > $ > > the unknown directories are OK. > what I am worried about is the "pending merges". > to be clear, what I want is an equivalent of "cvs up -C", i.e., get a > clean copy of the remote repo without any trace of any local changes.
After a merge you need to commit. -- Daniel Dehennin Récupérer ma clef GPG: gpg --keyserver pgp.mit.edu --recv-keys 0x6A2540D1 _______________________________________________ Dvc-dev mailing list [email protected] https://mail.gna.org/listinfo/dvc-dev
