Skip to Content.
Sympa Menu

cc-devel - Re: [cc-devel] svn gurus

cc-devel AT lists.ibiblio.org

Subject: Developer discussion for Creative Commons technology and tools

List archive

Chronological Thread  
  • From: Jon Phillips <jon AT rejon.org>
  • To: Victor Stone <fourstones.net AT gmail.com>
  • Cc: creative commons developers <cc-devel AT lists.ibiblio.org>
  • Subject: Re: [cc-devel] svn gurus
  • Date: Sun, 30 Sep 2007 19:13:00 -0700

I'd say let it fly if you can...ultimately, as last resort, create a
branch...

http://svnbook.red-bean.com/en/1.1/ch04s02.html

More below...

On Sun, 2007-09-30 at 18:42 -0700, Victor Stone wrote:
> sorry if I'm going too wide with this but I'd prefer to get this right...
>
> I'd like to create an svn branch in the cchost tree where I will make
> radical changes (move files around, create/destroy directories, etc.)
> -- this branch may become the mainline source (trunk) some day but we
> don't know that for sure.
>
> Stop me if I've missed something...
>
> I've read the svn docs and I gather that changes in the trunk have to
> be manually merged into the branch, but that at least the stat log
> will give me a heads up if that needs to happen.
>
> Devs who want to work in the new branch do so using svn switch
>
> If all goes well there is no svn operation to make the branch into the
> trunk. So it seems the best way is to
> a) create a local svn working dir with the current trunk
> b) grab a copy of the branch into into a non-svn tree
> c) create create a branch (snapshot) of the trunk in the repository
> d) use svn delete to wipe out files and dirs in (a)
> e) copy the branch files/dirs into (a) and do add/commits

All you need to do is svn copy the trunk to the branch dir, and then
commit that, then checkout the branch into a new location...that's
it...like the ex. from the URL above:

$ svn copy http://svn.example.com/repos/calc/trunk \
http://svn.example.com/repos/calc/branches/my-calc-branch \
-m "Creating a private branch of /calc/trunk."

Committed revision 341.

Then:

$ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch
A my-calc-branch/Makefile
A my-calc-branch/integer.c
A my-calc-branch/button.c
Checked out revision 341.

> This could destroy diff ancestry if (d) deletes a share file/dir but I
> hope that's the worst price to pay.

Nope, it copies everything over...like I said, might as well make
aggressive changes to the trunk, and as last resort branch...I don't
think we have enough devs. to warrant a branch, but you know what you
want ;)

Jon

> Is this making sense?
> VS
> _______________________________________________
> cc-devel mailing list
> cc-devel AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/cc-devel
--
Jon Phillips

San Francisco, CA
USA PH 510.499.0894
jon AT rejon.org
http://www.rejon.org

MSN, AIM, Yahoo Chat: kidproto
Jabber Chat: rejon AT gristle.org
IRC: rejon AT irc.freenode.net

Please note: the contents of this email are not intended to be
legal advice nor should they be relied upon as or represented to be
legal advice. Jon Phillips does not represent any organization through
this email address.





Archive powered by MHonArc 2.6.24.

Top of Page