Hi! I'm using the debian unstable version of baz. When I have local changes and I do baz update, it shows this:
* Scanning for full-tree revision: ..
* from revision library (linking):
[EMAIL PROTECTED]/games--mainline--0.1--patch-47
* Applying 1 revisions: .
* checking tree for local changes
* temporarily reverting local changes
* updating for new patches in archive
* applying changeset
A
{arch}/games/games--mainline/games--mainline--0.1/[EMAIL
PROTECTED]/patch-log/patch-48
M Source/de/ofahrt/games/engine/Game.java
M Source/de/ofahrt/games/ui/GameManager.java
M Source/de/ofahrt/games/ui/GamePainter.java
M Source/de/ofahrt/games/ui/HandPainter.java
M Source/de/ofahrt/games/ui/Painter.java
* reapplying local changes
****************************************************
1 conflicted items in this tree. Please
resolve each conflict with baz "resolved 'filename'"
****************************************************
In particular, it doesn't show WHICH files have conflicts.
Cheers,
-- Ulf
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Gnu-arch-users mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
