Package: git-bzr Version: 1:1.8.2-1 Severity: normal When I clone the foxtrotgps bzr repository using git-bzr, there is one file missing from the resulting working directory.
In the bzr log, I see that the missing file was replaced by a new
version of itself. Based on the bzr and git log information, it looks
like git-bzr is adding the new version of the file and deleting it
instead of deleting it and adding the new version (replacing it).
pabs@chianamo ~ $ mkdir git-bzr-bug-missing-files
pabs@chianamo ~ $ cd git-bzr-bug-missing-files/
pabs@chianamo ~/git-bzr-bug-missing-files $ bzr branch lp:foxtrotgps
foxtrotgps-bzr
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data. See "bzr help launchpad-login".
Branched 232 revisions.
pabs@chianamo ~/git-bzr-bug-missing-files $ cd foxtrotgps-bzr/
pabs@chianamo ~/git-bzr-bug-missing-files/foxtrotgps-bzr $ find ! -iname .bzr !
-iwholename '*/.bzr/*' | sort > ../foxtrotgps-bzr-files
pabs@chianamo ~/git-bzr-bug-missing-files/foxtrotgps-bzr $ cd ..
pabs@chianamo ~/git-bzr-bug-missing-files $ git clone bzr::lp:foxtrotgps
foxtrotgps-git
Cloning into 'foxtrotgps-git'...
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data. See "bzr help launchpad-login".
progress revision roz...@geekspace.com-20100507043653-unbq6ldi2j7virgw (100/567)
progress revision roz...@geekspace.com-20100602051627-2xt9jsdpojcxbo47 (200/567)
progress revision roz...@geekspace.com-20101017210852-ltxtt1htxqs0v5uh (300/567)
progress revision roz...@geekspace.com-20110413003604-9su7poyse1t1ajsf (400/567)
progress revision roz...@geekspace.com-20120206041904-5derbaceszb4r824 (500/567)
pabs@chianamo ~/git-bzr-bug-missing-files $ cd foxtrotgps-git/
pabs@chianamo ~/git-bzr-bug-missing-files/foxtrotgps-git (master =) $ find !
-iname .git ! -iwholename '*/.git/*' | sort > ../foxtrotgps-git-files
pabs@chianamo ~/git-bzr-bug-missing-files/foxtrotgps-git (master =) $ cd ..
pabs@chianamo ~/git-bzr-bug-missing-files $ diff -u foxtrotgps-bzr-files
foxtrotgps-git-files
--- foxtrotgps-bzr-files 2013-04-08 15:53:24.706619204 +0800
+++ foxtrotgps-git-files 2013-04-08 15:53:53.478618930 +0800
@@ -35,7 +35,6 @@
./pixmaps/foxtrotgps-friend.png
./pixmaps/foxtrotgps-myposition.png
./pixmaps/foxtrotgps-photo.png
-./pixmaps/foxtrotgps.png
./pixmaps/foxtrotgps-poi.png
./pixmaps/foxtrotgps-wp.png
./pixmaps/Makefile.am
pabs@chianamo ~/git-bzr-bug-missing-files/foxtrotgps-bzr $ bzr log -p
pixmaps/foxtrotgps.png
------------------------------------------------------------
revno: 71 [merge]
committer: Joshua Judson Rosen <roz...@geekspace.com>
branch nick: trunk
timestamp: Mon 2010-05-31 02:54:04 -0400
message:
New main application icon, specifically created for FoxtrotGPS.
diff:
=== added file 'pixmaps/foxtrotgps.png'
Binary files pixmaps/foxtrotgps.png 1970-01-01 00:00:00 +0000 and
pixmaps/foxtrotgps.png 2010-05-31 06:38:02 +0000 differ
=== removed file 'pixmaps/foxtrotgps.png'
Binary files pixmaps/foxtrotgps.png 2010-04-14 01:13:14 +0000 and
pixmaps/foxtrotgps.png 1970-01-01 00:00:00 +0000 differ
------------------------------------------------------------
Use --include-merged or -n0 to see merged revisions.
pabs@chianamo ~/git-bzr-bug-missing-files/foxtrotgps-bzr $ bzr log
--include-merged -p pixmaps/foxtrotgps.png
------------------------------------------------------------
revno: 71 [merge]
committer: Joshua Judson Rosen <roz...@geekspace.com>
branch nick: trunk
timestamp: Mon 2010-05-31 02:54:04 -0400
message:
New main application icon, specifically created for FoxtrotGPS.
diff:
=== added file 'pixmaps/foxtrotgps.png'
Binary files pixmaps/foxtrotgps.png 1970-01-01 00:00:00 +0000 and
pixmaps/foxtrotgps.png 2010-05-31 06:38:02 +0000 differ
=== removed file 'pixmaps/foxtrotgps.png'
Binary files pixmaps/foxtrotgps.png 2010-04-14 01:13:14 +0000 and
pixmaps/foxtrotgps.png 1970-01-01 00:00:00 +0000 differ
------------------------------------------------------------
revno: 14.1.4
committer: Joshua Judson Rosen <roz...@geekspace.com>
branch nick: project-rename
timestamp: Mon 2010-05-31 02:38:02 -0400
message:
New foxtrotgps icon, actually distinct from the tangogps one.
diff:
=== added file 'pixmaps/foxtrotgps.png'
Binary files pixmaps/foxtrotgps.png 1970-01-01 00:00:00 +0000 and
pixmaps/foxtrotgps.png 2010-05-31 06:38:02 +0000 differ
=== removed file 'pixmaps/foxtrotgps.png'
Binary files pixmaps/foxtrotgps.png 2010-04-14 01:13:14 +0000 and
pixmaps/foxtrotgps.png 1970-01-01 00:00:00 +0000 differ
pabs@chianamo ~/git-bzr-bug-missing-files/foxtrotgps-git (master =) $ git log
-p -- pixmaps/foxtrotgps.png
commit 2373bdd86384f240f7987a830f0cf78e0fae4e3a
Author: Joshua Judson Rosen <roz...@geekspace.com>
Date: Mon May 31 02:38:02 2010 -0400
New foxtrotgps icon, actually distinct from the tangogps one.
diff --git a/pixmaps/foxtrotgps.png b/pixmaps/foxtrotgps.png
deleted file mode 100644
index ce431f8..0000000
Binary files a/pixmaps/foxtrotgps.png and /dev/null differ
commit 8bca36dff6d368812e2291037d2ba3e4a02308fe
Author: Joshua Judson Rosen <roz...@geekspace.com>
Date: Tue Apr 13 21:13:14 2010 -0400
Replaced occurrences of "tango" with "foxtrot" in code/text, and renamed
files starting with "tango" to start with "foxtrot".
diff --git a/pixmaps/foxtrotgps.png b/pixmaps/foxtrotgps.png
new file mode 100644
index 0000000..ce431f8
Binary files /dev/null and b/pixmaps/foxtrotgps.png differ
-- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (700, 'testing'), (600, 'unstable'), (550, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-bzr depends on:
ii git 1:1.8.2-1
ii python 2.7.3-4
ii python-bzrlib 2.6.0~bzr6526-1
Versions of packages git-bzr suggests:
ii bzr 2.6.0~bzr6526-1
pn git-doc <none>
--
bye,
pabs
http://wiki.debian.org/PaulWise
signature.asc
Description: This is a digitally signed message part
