Hi Damien,
Am 2012-10-12 00:28, schrieb Damien Robert:
Actually, I don't think you need to make 'grafting mergs done with the
subtree strategy'. When you use grafts, you change the parent of the
commits, but you don't change the snapshot of the repository corresponding
with the commit. Let's s
Carsten Fuchs wrote in message:
> However, having to convert an existing repository from Subversion, where
I ultimatively
> need grafting to reproduce the proper branching structure, the conversion
reduces to the
> question:
>
> "Can I combine grafting with the subtree merging strate
Hi Damien,
Am 2012-10-10 01:10, schrieb Damien Robert:
if I have understood your problem correctly, it looks like the git subtree
script could help you a lot.
[...]
Unfortunately, the above proposition will only help you track vendor
branches after you have done the conversion, but not in the
Am 2012-10-10 08:02, schrieb Thomas Ferris Nicolaisen:
One repo should have one versioning scheme. Think about tagging. You want to
identify
versions of lua "1.0", "1.1", and so on. If you keep a lot of products in one
vendor
repo, it will be filled with tags of different versioning schemes l
Glad you could make some progress. I'll reply on your discussions/questions:
> In http://happygiraffe.net/blog/2008/02/07/vendor-branches-in-git/, would
> you say that
> his "upstream" branch has some arbitrary content?
>
I'd say it looks like he's forking the original wordpress distributable
Carsten Fuchs wrote in message :
>> and transform them into having the
>> structure you want. See the man page for filter-branch, there's an
example for "/To move
>> the whole tree into a subdirectory/".
>
> Ahh!! Thank you very much!
> That was the crucial step that I was missing before!
Hi Thomas,
Am 2012-10-09 12:35, schrieb Thomas Ferris Nicolaisen:
A branch in Git is uusally a branch of *what is the main contents of the
repository*,
not some arbitrary content. As I said above, submodules were invented for this
purpose,
to avoid filling up your own repositories with thing
On Tuesday, October 9, 2012 11:14:48 AM UTC+2, Carsten wrote:
>
>
>
> Hi Thomas,
>
> Am 09.10.2012 09:35, schrieb Thomas Ferris Nicolaisen:
> > So, if you want to make an upgrade of for example lua, you first
> download and unzip it into
> > /vendor/ExtLibs/lua/, make some adaptions, and then
Hi Thomas,
Am 09.10.2012 09:35, schrieb Thomas Ferris Nicolaisen:
So, if you want to make an upgrade of for example lua, you first download and
unzip it into
/vendor/ExtLibs/lua/, make some adaptions, and then merge it into trunk and any
other branch
where you want to perform the upgrade. Is
So, if you want to make an upgrade of for example lua, you first download
and unzip it into /vendor/ExtLibs/lua/, make some adaptions, and then merge
it into trunk and any other branch where you want to perform the upgrade.
Is this correct?
As a thought-experiment: Set aside the git-svn convers
10 matches
Mail list logo
