Workflow - Tracking upstream repository with local patches

[John Arbash Meinel]

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

Paul Moore wrote:
> On 13/03/2008, Andrew Bennetts <andrew at canonical.com> wrote:
>> Also, if you're having trouble bootstrapping your own import, it may help if you
>>  do grab a copy of mine into the shared repo you are importing into.  bzr-svn
>>  should then be able to skip re-importing those revisions, which might avoid
>>  whatever problem it is you're hitting.
> 
> That worked brilliantly. Branching from your repo was very fast, and
> then bzr pull --remember from the original URL brings things up to
> date nicely.
> 
> One thing I hadn't anticipated is that bzr revision numbers and svn
> revision numbers don't match. How that will affect using the bzr copy,
> I'll have to see (it'll certainly make interpreting a comment like
> "fixed in r61371", which actually refers to bzr revno 38496, somewhat
> challenging...)
> 
> Thanks again,
> Paul.
> 
> 

Well remember that SVN revision numbers change for every commit to the
whole repository, regardless of what "branch" they are in. (Since svn
doesn't actually have branches.) So if you have a mini-project which has
2 commits in it, they could be revno 10 and 10,000. I personally like to
see them as commit 1 and 2.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH2ZncJdeBCYSNAAMRAv3qAJ95jSIicC9D+BYaKwWifOjo3912dgCffNBm
px5fu8MsLGYWImIRAJGgvBQ=
=HXoW
-----END PGP SIGNATURE-----