[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Conflict files in {arch}
From: |
Yann Droneaud |
Subject: |
[Gnu-arch-users] Conflict files in {arch} |
Date: |
Sat, 11 Sep 2004 14:59:10 +0200 |
User-agent: |
Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux) |
Conflicts files (.orig and .rej) are valid in {arch}:
tree-lint doesn't choke on them.
$ tla undo
* linting the source tree
* reverting changes
M README
M {arch}/=tagging-method
$ ls
,,undo-1/ ChangeLog ChangeLog2 README {arch}/
$ /home/meuh/src/tla/tla-1.2.2rc2/\=build/tla/tla/tla apply-changeset ,,undo-1
Error encountered accessing directory (Bad address)
Path: (null)
M README
M {arch}/=tagging-method
(apply it one more time: this is an example why tla undo exist)
$ /home/meuh/src/tla/tla-1.2.2rc2/\=build/tla/tla/tla apply-changeset ,,undo-1
Error encountered accessing directory (Bad address)
Path: (null)
C README
C {arch}/=tagging-method
$ ls
,,undo-1/ ChangeLog ChangeLog2 README README.orig README.rej {arch}/
$ cd \{arch\}/ && ls && cd ..
++default-version ,,inode-sigs/ =tagging-method =tagging-method.orig
=tagging-method.rej tata/
$ /home/meuh/src/tla/tla-1.2.2rc2/\=build/tla/tla/tla tree-lint
[no message = no error]
$ /home/meuh/src/tla/tla-1.2.2rc2/\=build/tla/tla/tla commit -s "Conflict added"
A {arch}/=tagging-method.orig
A {arch}/=tagging-method.rej
M {arch}/=tagging-method
M README
* committed address@hidden/tata--main--1.0--patch-2
I don't see that as a bug,
but is there a chance to add a fix to prevent stupid user adding
conflict files to an archive ?
Regards.
--
Yann Droneaud (aka Meuh) <address@hidden>
http://meuh.org/ | http://sherkan.tuxfamily.net/~meuh/
Une vache perdue sur Internet | A cow lost in the Internet
1024D/BEA43321 5D91 B5B0 5137 B8FE 6882 FE19 CAA0 6F05 BEA4 3321
- [Gnu-arch-users] Conflict files in {arch},
Yann Droneaud <=