Debian Bug report logs - #586096
bzr-svn: Partial commit breaks status/diff of uncommitted files

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Paul Evans <leonerd@leonerd.org.uk>

To: Debian Bug Tracking System <submit@bugs.debian.org>

Subject: bzr-svn: Partial commit breaks status/diff of uncommitted files

Date: Wed, 16 Jun 2010 12:26:38 +0100

Package: bzr-svn
Version: 1.0.2-2
Severity: normal


1. svn co {some URL}
2. edit two files

At this point, bzr diff, bzr status, svn diff, svn status, all can see
both changes.

3. bzr commit one of the files (bzr ci path/to/A)

Now, none of the above tools notice the changes in the file, even though

  svn cat {URL to file in repo} | diff - path/to/B

can see a difference.

Workaround:

  pushd path/to
  rm -rf .svn
  svn co --force {URL to this dir in repo} .
  popd

Now all the tools are again happy.

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages bzr-svn depends on:
ii  bzr                          2.1.2-1     easy to use distributed version co
ii  python                       2.5.4-9     An interactive high-level object-o
ii  python-central               0.6.14+nmu2 register and build utility for Pyt
ii  python-subvertpy             0.7.2-2     Alternative Python bindings for Su

Versions of packages bzr-svn recommends:
ii  python-tdb                    1.2.1-2    Python bindings for TDB
pn  python-xdg                    <none>     (no description available)

Versions of packages bzr-svn suggests:
ii  bzr-rebase                    0.6.0-1    transitional dummy package for bzr
ii  bzr-rewrite [bzr-rebase]      0.6.0-1    History rewriting plugin for Bazaa

-- no debconf information

Message #10 received at 586096@bugs.debian.org (full text, mbox, reply):

From: Jelmer Vernooij <jelmer@apache.org>

To: Paul Evans <leonerd@leonerd.org.uk>, 586096@bugs.debian.org

Cc: new <new@bugs.launchpad.net>

Subject: Re: [Pkg-bazaar-maint] Bug#586096: bzr-svn: Partial commit breaks status/diff of uncommitted files

Date: Wed, 16 Jun 2010 19:28:30 +0200

  affects bzr-svn
  status triaged
  importance medium

On Wed, 2010-06-16 at 12:26 +0100, Paul Evans wrote:
> Package: bzr-svn
> Version: 1.0.2-2
> Severity: normal
> 
> 
> 1. svn co {some URL}
> 2. edit two files
> 
> At this point, bzr diff, bzr status, svn diff, svn status, all can see
> both changes.
> 
> 3. bzr commit one of the files (bzr ci path/to/A)
> 
> Now, none of the above tools notice the changes in the file, even though
> 
>   svn cat {URL to file in repo} | diff - path/to/B
> 
> can see a difference.
> 
> Workaround:
> 
>   pushd path/to
>   rm -rf .svn
>   svn co --force {URL to this dir in repo} .
>   popd
> 
> Now all the tools are again happy.
This probably has something to do with the fact that we touch all the
files in the working tree and update their last modification time,
causing Subversion to think that they haven't been changed.

Cheers,

Jelmer

Message #15 received at 586096@bugs.debian.org (full text, mbox, reply):

From: Paul LeoNerd Evans <leonerd@leonerd.org.uk>

To: Jelmer Vernooij <jelmer@apache.org>

Cc: 586096@bugs.debian.org, new <new@bugs.launchpad.net>

Subject: Re: [Pkg-bazaar-maint] Bug#586096: bzr-svn: Partial commit breaks status/diff of uncommitted files

Date: Thu, 17 Jun 2010 12:39:26 +0100

[Message part 1 (text/plain, inline)]

On Wed, Jun 16, 2010 at 07:28:30PM +0200, Jelmer Vernooij wrote:
> This probably has something to do with the fact that we touch all the
> files in the working tree and update their last modification time,
> causing Subversion to think that they haven't been changed.

I've just tried 'touch'ing a file after a bzr partial commit, and that
doesn't help.

-rw-r--r-- 1 paul paul 19K Jun 17 12:35 src/Sweeper.pm
-rw-r--r-- 1 paul paul 19K Jun 17 12:34 src/.svn/text-base/Sweeper.pm.svn-base

$ cmp src/Sweeper.pm src/.svn/text-base/Sweeper.pm.svn-base
((identical))

$ svn cat src/Sweeper.pm | diff - src/Sweeper.pm
((identical))

$ svn cat svn+ssh://.../src/Sweeper.pm | diff - src/Sweeper.pm
((differences follow...))


-- 
Paul "LeoNerd" Evans

leonerd@leonerd.org.uk
ICQ# 4135350       |  Registered Linux# 179460
http://www.leonerd.org.uk/

[signature.asc (application/pgp-signature, inline)]

Message #22 received at 586096-close@bugs.debian.org (full text, mbox, reply):

From: Jelmer Vernooij <jelmer@debian.org>

To: 586096-close@bugs.debian.org

Subject: Bug#586096: fixed in bzr-svn 1.1.1-1

Date: Wed, 26 Oct 2011 04:02:12 +0000

Source: bzr-svn
Source-Version: 1.1.1-1

We believe that the bug you reported is fixed in the latest version of
bzr-svn, which is due to be installed in the Debian FTP archive:

bzr-svn_1.1.1-1.debian.tar.gz
  to main/b/bzr-svn/bzr-svn_1.1.1-1.debian.tar.gz
bzr-svn_1.1.1-1.dsc
  to main/b/bzr-svn/bzr-svn_1.1.1-1.dsc
bzr-svn_1.1.1-1_all.deb
  to main/b/bzr-svn/bzr-svn_1.1.1-1_all.deb
bzr-svn_1.1.1.orig.tar.gz
  to main/b/bzr-svn/bzr-svn_1.1.1.orig.tar.gz



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 586096@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jelmer Vernooij <jelmer@debian.org> (supplier of updated bzr-svn package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Tue, 25 Oct 2011 17:31:31 -0700
Source: bzr-svn
Binary: bzr-svn
Architecture: source all
Version: 1.1.1-1
Distribution: unstable
Urgency: low
Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
Changed-By: Jelmer Vernooij <jelmer@debian.org>
Description: 
 bzr-svn    - Bazaar plugin providing Subversion integration
Closes: 586096
Changes: 
 bzr-svn (1.1.1-1) unstable; urgency=low
 .
   * New upstream release.
    + Supports 'bzr break-lock' on svn working trees. LP: #855113
    + Partial commit no longer breaks working tree status. LP: #834918,
      Closes: #586096
Checksums-Sha1: 
 efd18199329e616738f98fff0e08687280ac5234 1456 bzr-svn_1.1.1-1.dsc
 eb2f13ec2fd078bf4590a0002a842279f6b13187 292162 bzr-svn_1.1.1.orig.tar.gz
 d1f5f0f0c48a0a1e3a8d4d288bf57dea818d5681 7025 bzr-svn_1.1.1-1.debian.tar.gz
 00a92327a6434fa028c46cb5799ba4198bd18a66 264670 bzr-svn_1.1.1-1_all.deb
Checksums-Sha256: 
 cdce2d05b06ddbd555c7f27250ad6300e90ab1b3c3dcadf2809c0456167b4467 1456 bzr-svn_1.1.1-1.dsc
 584cbaba447a32a23ae5e5ddbdc7e07103a4804df900725c2fbf8963204ee4d9 292162 bzr-svn_1.1.1.orig.tar.gz
 f45c29d3bdddf87cbf73710c986fd6646412a6b8665847a3c298686c3808e849 7025 bzr-svn_1.1.1-1.debian.tar.gz
 29bba67cfc4810a82fa43a0092acb14c3b7621cff6c914a3119729f259fdcb46 264670 bzr-svn_1.1.1-1_all.deb
Files: 
 d12e7df7c76bab9f7a47c1aaca8e24cb 1456 vcs optional bzr-svn_1.1.1-1.dsc
 676ec93c57ca91fbf60bbecfa67a772a 292162 vcs optional bzr-svn_1.1.1.orig.tar.gz
 db7311ca88d6132490a101db020e9a23 7025 vcs optional bzr-svn_1.1.1-1.debian.tar.gz
 2836f35769c075c10b8b87c8fe938540 264670 vcs optional bzr-svn_1.1.1-1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk6ngxAACgkQPa9Uoh7vUnYsBwCgiBQGQ3fipg811qlxMEdurFWd
E9UAoJAX6rNwWlGiGXcozZfcbBl0rkwQ
=7kbO
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.