From: Steven Walter <stevenrwalter@gmail.com>
To: Eric Wong <normalperson@yhbt.net>
Cc: git@vger.kernel.org, stevenrwalter@gmail.com
Subject: Re: git-svn and branches
Date: Fri, 28 Sep 2007 13:19:59 -0400 [thread overview]
Message-ID: <20070928171959.GA21816@dervierte> (raw)
In-Reply-To: <20070927072404.GB1782@hand.yhbt.net>
On Thu, Sep 27, 2007 at 12:24:04AM -0700, Eric Wong wrote:
> I believe your case handles where a branch is created directly from a
> trunk copy with no file modifications in the branch, but not when a
> branch is created and files are modified in the trunk (or branch) within
> the same revision. Is this what's happening?
>
> Additionally, I think this breaks when an entire trunk or branch is
> moved around because the original directory has moved or gone away:
>
> /trunk => /project-a/trunk
>
> Anyways, as Sam said, newer SVN (1.4.4+) has a working do_switch()
> function and that code path will never be hit at all.
I think you're right that my code would only handle a verbatim copy. I
made a few changes and I think I have something that is more generally
useful. Using a newer version of subversion isn't practical for me, as
this is a work situation where I don't have control of the workstations.
One criticism of the patch: the trees_match function probably needs to
be re-written. My SVN::Perl-foo is weak.
Patch to follow
--
-Steven Walter <stevenrwalter@gmail.com>
"A human being should be able to change a diaper, plan an invasion,
butcher a hog, conn a ship, design a building, write a sonnet, balance
accounts, build a wall, set a bone, comfort the dying, take orders,
give orders, cooperate, act alone, solve equations, analyze a new
problem, pitch manure, program a computer, cook a tasty meal, fight
efficiently, die gallantly. Specialization is for insects."
-Robert Heinlein
prev parent reply other threads:[~2007-09-28 17:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-27 2:12 git-svn and branches Steven Walter
2007-09-27 6:36 ` Sam Vilain
2007-09-27 7:24 ` Eric Wong
2007-09-28 17:19 ` Steven Walter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070928171959.GA21816@dervierte \
--to=stevenrwalter@gmail.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).