[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: binary diff/patch

From: Ruslan Sivak <rsivak_at_istandfor.com>
Date: 2006-10-03 20:10:40 CEST

I am thinking about doing that now... I didn't want to use the same
repo, as it would require a reorganization. Also I'm using trac with
these repo's, so I wanted a separate trac environment for each repo.

The reason I don't want to use branches is because we already have a
branch that gets created for every trac ticket, and then gets merged
into the trunk. I'm thinking if I put everything in the same repo, I
would organize it like this:

 project1
    tags
    branches
    trunk
project2
   tags
   branches
   trunk

Is this a workable solution? I should still be able to merge things
here, right? For example, have a working copy of project2/trunk and
merge the changes between project1/branches/T1 and project1/tags/pre-T1
both of which were originally copied from project1/trunk.

Russ

Ryan Schmidt wrote:
> On Oct 3, 2006, at 12:45, Ruslan Sivak wrote:
>
>> We've decided to take a copy of the latest project and split it off
>> into it's own repository as we expect major changes to be made to
>> this codebase. The codebase includes text files and image files. I
>> am planning to port certain changes from the old repository to the
>> new one by creating patches and applying them to the new repository.
>> Is this possible? I can't seem to find a good way to do this. When I
>> try to do a svn diff on binary files, it says that it's not supported.
>
> Correct, I don't think there's a good way to express differences of
> binary files... at least not with the standard unix patch format,
> which is what svn diff emulates.
>
> You could just copy the new file from the one repository over the old
> file in the other repository.
>
> But why do you want to make separate repositories here? Why not just
> make a branch in your existing repository? Then you can use svn merge
> the way it was intended.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 3 20:11:53 2006

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.