Viewing all changes in revision 18.
- Committer: Elliot Murphy
- Date: 2010-03-02 21:06:30 UTC
- Revision ID: elliot@elliotmurphy.com-20100302210630-8escgnzm6xnrjn8w
In the last upload, I incorrectly resolved the merge presented
after running bzr merge-upstream --version=0.6.2
../desktopcouch_0.6.2.orig.tar.gz. So, the last upload had incorrect
contents in the tarball for desktopcouch/records/server_base.py and
desktopcouch/replication.py. This revision restores the correct contents
of those two files to match what was shipped in the upstream tarball.
after running bzr merge-upstream --version=0.6.2
../desktopcouch_0.6.2.orig.tar.gz. So, the last upload had incorrect
contents in the tarball for desktopcouch/records/server_base.py and
desktopcouch/replication.py. This revision restores the correct contents
of those two files to match what was shipped in the upstream tarball.
expand all
collapse all
added
removed
