> I can't find it now, but I recall reading on the Mercurial site that it
> doesn't support versioning directories, which seems like an awful step
> back into cvs-land. Maybe I misunderstood?
Directory versioning is obviously supported. There are some limits on
renaming:
http://www.selenic.com/p
I've had good luck using the svnmerge.py script in svn contrib:
http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py
It makes branch and merge management *almost* as reasonable as it is
with a branch-centric system like bzr.
I can't find it now, but I recall reading on the Merc
On 17 maj 2006, at 12.45, Michael Radziej wrote:
> Nicola Larosa (tekNico) wrote:
>
>>> /me makes another note to spend some serious time with BZR...
>>
>> Try spending some time with Mercurial, too. It's simpler, smaller and
>> faster than Bazaar-NG, while also being written in Python, with a
>>
Nicola Larosa (tekNico) wrote:
>> /me makes another note to spend some serious time with BZR...
>
> Try spending some time with Mercurial, too. It's simpler, smaller and
> faster than Bazaar-NG, while also being written in Python, with a
> little C.
Hmm. I'm using git for django. There's a tool
> /me makes another note to spend some serious time with BZR...
Try spending some time with Mercurial, too. It's simpler, smaller and
faster than Bazaar-NG, while also being written in Python, with a
little C.
--
Nicola Larosa - http://www.tekNico.net
--~--~-~--~~~
On May 16, 2006, at 3:37 PM, [EMAIL PROTECTED] wrote:
> Bizzaro-tastic! Spent half of the morning trying to figure this out. I
> finally just blew away the branch, got a fresh checkout, and Ta Da!
>
> /ME grumbles something about svn, makes a note, and goes back to work
Oh man have I ever been th
Bizzaro-tastic! Spent half of the morning trying to figure this out. I
finally just blew away the branch, got a fresh checkout, and Ta Da!
/ME grumbles something about svn, makes a note, and goes back to work
Joseph
--~--~-~--~~~---~--~~
You received this messag
I'm trying to merge changes from the trunk into the multi-auth branch.
svn merge --dry-run -r 2892:HEAD
http://code.djangoproject.org/svn/django/trunk
works fine, but when I try to do it for real:
svn merge -r 2892:HEAD http://code.djangoproject.org/svn/django/trunk
svn barfs with the
