Bazaar doesn't notice/care if you try to version-control *.THIS, *.BASE, *.OTHER or *.moved
Bug #414589 reported by
.
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Vincent Ladeuil |
Bug Description
We've been using etckeeper on /etc, and somehow managed to get some conflicts in there.
Then etckeeper seemingly added the files containing the conflicts (made by bazaar).
In general it might be nice to display a warning to the user if he tries to add files generated by Bazaar with conflicts.
Related branches
lp:~vila/bzr/integration2
(Merged)
Changed in bzr: | |
importance: | Undecided → High |
Changed in bzr: | |
status: | Confirmed → In Progress |
milestone: | none → 2.2.0b1 |
Changed in bzr: | |
status: | In Progress → Fix Released |
To post a comment you must log in.
From IRC - more context: informative about that particular case.
---
09:22 < lifeless> sandsmark: could you file a bug? we should be more
graceful/
09:22 < sandsmark> lifeless: well, 1.5 is pretty old
09:22 < lifeless> even so
09:22 < sandsmark> ok
09:23 < lifeless> if its fixed already it will be easy to close ;)
09:23 < sandsmark> heh, ok :-)
09:23 < lifeless> but while I suspect we have a bug thats similar to
this already, I'm fairly sure we haven't actioned it.
09:23 < lifeless> so at worst this will be a dup and add data to the
frequency people hit it.
09:24 < sandsmark> lifeless: uhm, is this really a bug, though? I would
rather say the problem is with etckeeper, adding all files
indiscriminately
09:24 < sandsmark> (the real question is where the conflict comes from,
though)
09:25 < lifeless> bzr could help - it could say 'this is a dangerous
file to add', it could, on conflicts, not conflict on that file but
instead know it can overwrite it;it could adjust the conflict path it
uses
----