my first checkin
Gerald (Jerry) Carter
jerry at samba.org
Mon Mar 28 21:58:52 GMT 2005
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
derrell at samba.org wrote:
| Argh. I think I screwed up (already). I checked my
| stuff in to SAMBA_3_0, which appears to be the RELEASED
| branch, whereas SAMBA_3_0_RELEASE appears to
| be the NOT YET RELEASED branch. Is that right? I think
| I understand correctly that _RELEASE mean "NOT RELEASED",
| right? Sigh.
Nope. you are ok. the _RELEASE branch is a staging area
I use. I don't think you can check in there anyways.
| How is SAMBA_3_0{,_RELEASE} used and manipulated vs. TRUNK?
trunk/ risky, experiemental changes
SAMBA_3_0/ stable development tree
SAMBA_3_0_RELEASE/ staging area for release
You should check your code into SAMBA_3_0 and trunk. Use
trunk if you need to spend some time working things out
and the bring them back to SAMBA_3_0.
| How do I un-checkin a previous checkin, before someone
| retrieves the released code and finds something there
| that wasn't in the binary? :-(
See above. The change is ok in SAMBA_3_0.
But if you ever need to revert, just run 'svn diff' in the
opposite direction. For example:
svn diff -r6102:6092 | patch
Then commit back to the repository. There may be an easier
way, but this works for me.
cheers, jerry
=====================================================================
Alleviating the pain of Windows(tm) ------- http://www.samba.org
GnuPG Key ----- http://www.plainjoe.org/gpg_public.asc
"I never saved anything for the swim back." Ethan Hawk in Gattaca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFCSH4cIR7qMdg1EfYRAu8+AKDiZoTP68nae8bpFeNoFQZ+op/k7QCgufqt
Y+17SR0Nn79VpdAtZs/IIHM=
=MvJK
-----END PGP SIGNATURE-----
More information about the samba-technical
mailing list