This bug was fixed in the package bzr - 2.2.0-1
---
bzr (2.2.0-1) unstable; urgency=low
* New upstream release.
+ Adds support for setting timestamps to originating revisions.
Closes: #473450
+ Removes remaining string exception. Closes: #585193, LP: #586926
+ Add C ex
** Branch linked: lp:debian/sid/bzr
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
u
In other words:
bzr add
won't add foo.BASE/OTHER/THIS
bzr add foo.BASE
will add it because the user explicitly request it
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because
See bug #414589 for the rationale
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubu
What has been fixed is that a warning is now generated if a file helper
generated for a text conflict (.OTHER, .BASE, .THIS) was (previsously)
added via 'bzr add'.
I.e. bzr don't add this files blindly now, they have to be added
explicitly (because we can't *forbid* that).
This should lead to *fe
Merci Vincent. A simple question: this bug is "fix released": what has
been fixed? Could you please show a concrete scenario, for which the fix
makes a difference (and what difference?). I need to look at this
because Canonical's Support team would like to be able to close the
incident. Thanks!
--
> GuilhemBichot writes:
> So I can commit, no warning.
> I think I don't understand what has been fixed exactly.
> The changelog says
> http://doc.bazaar.canonical.com/bzr.dev/en/release-notes/bzr-2.2.0b1.html
> "bzr add will not add conflict related files unless explicitl
Hello. I have a bzr.dev with Vincent's fix, but don't see the bug as fixed.
First I create a conflict which moves a file:
cd /tmp
rm -rf test
mkdir test
cd test
bzr init br1
cd br1
echo > bar
bzr add bar
bzr commit -m r0
bzr branch . ../br2
echo > foo
bzr add .
bzr commit -m r1
cd ../br2
echo a > f
Bonjour Vincent; does your branch cover the case of .moved files?
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
** Changed in: bzr
Status: In Progress => Fix Released
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
** Branch linked: lp:~vila/bzr/integration2
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailin
** Changed in: bzr
Milestone: None => 2.2.0b1
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs
Rhett, please only assign bugs to yourself, never to a team unless you
manage the time of the people on that team. Assigning - giving
responsibility to someone - doesn't make sense unless you control how
they spend their time.
** Changed in: bzr (Ubuntu)
Assignee: bzr-qa (bzr-qa) => (unassign
** Changed in: bzr
Assignee: bzr-qa (bzr-qa) => Vincent Ladeuil (vila)
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to
** Changed in: bzr
Assignee: (unassigned) => bzr-qa (bzr-qa)
** Changed in: bzr (Ubuntu)
Assignee: (unassigned) => bzr-qa (bzr-qa)
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notificati
** Changed in: bzr
Status: Confirmed => In Progress
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubu
Agree with Vincent's comment that it should at least warn.
This is less a burning problem now as our devs are more fluent in bzr than
before, so they do sensible things when merging.
Though there will always be beginners.
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.mov
** Tags added: conflicts
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@
** Changed in: bzr
Assignee: Martin Pool (mbp) => (unassigned)
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
Another aspect of the same problem can be seen in bug #414589.
The rule should be that bzr should *at least* warn (optionally loudly)
if files, generated by bzr for conflict resolution purposes, are added
or committed (#414589 is about add only).
--
MYSQL/BZR - P3: How to avoid that people commi
** Visibility changed to: Public
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
ubun
21 matches
Mail list logo
