Source Mage code commit list

[Eric Sandall <eric AT sandall.us>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Arwed von Merkatz wrote:
> On Sat, May 06, 2006 at 03:40:30PM -0500, Eric Sandall wrote:
>> GIT changes to devel grimoire by Eric Sandall <sandalle AT sourcemage.org>:
>>
>>  libs/aqbanking/BUILD   |   15 ++++++---------
>>  libs/aqbanking/DEPENDS |    8 ++++----
>>  libs/aqbanking/HISTORY |   10 ++++++++++
>>  3 files changed, 20 insertions(+), 13 deletions(-)
>>
>> New commits:
>> commit 84aa8430647bdc1ceed56a6849c69bd335559b86
>> Author: Eric Sandall <sandalle AT sourcemage.org>
>> Commit: Eric Sandall <sandalle AT sourcemage.org>
>>
>>     Merging changes from test (master) to devel
> 
> Why? In my working with git I came to the conclusion that a standing
> devel branch is probably not a good idea, instead we should create new
> branches for WIP stuff if that's possible. Does anyone know whether it's
> possible with git to create a new branch in a remote repository? If not,
> a standing devel branch is what we'd have to deal with, but there's
> various drawbacks to that compared to 'real' feature branches.
<snip>

Because devel has changes that weren't integrated to test in P4 and I
made changes in test via git and now need to sync test -> devel so I can
then sync devel -> test (if I'm understanding correctly).

I am now trying to figure out, since devel is now in sync, how to pull
everything in devel (multiple changes) into test, but cherry-pick is
only for a single change. I think I need to use `git merge` and list
multiple remotes and use the octopus strategy, but I have not tried that
yet.

- -sandalle

- --
Eric Sandall                     |  Source Mage GNU/Linux Developer
eric AT sandall.us                  |  http://www.sourcemage.org/
http://eric.sandall.us/          |  SysAdmin @ Shock Physics @ WSU
http://counter.li.org/  #196285  |  http://www.shock.wsu.edu/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEXRgyHXt9dKjv3WERAk4uAJ4hOlqRhlflCHESWtaFrtpfmpmN7QCfVK71
dBJBPtnbM2Jo86UB0Ctj38M=
=TMGf
-----END PGP SIGNATURE-----