Is this merge gonna happen soon? Any foreseeable problems if I begin evolving the trunk before that merge? Joaquín M López Muñoz Telefónica, Investigación y Desarrollo
Joaquín Mª López Muñoz <joaquin@tid.es> writes:
Is this merge gonna happen soon? Any foreseeable problems if I begin evolving the trunk before that merge?
If there are changes in 1.32.0 that haven't shown up on the trunk (there should be few -- the standard procedure is to change the trunk and merge to the branch), it's up to individual developers to merge them back in as they see fit. There's no official merge process. -- Dave Abrahams Boost Consulting http://www.boost-consulting.com
David Abrahams ha escrito:
Joaquín Mª López Muñoz <joaquin@tid.es> writes:
Is this merge gonna happen soon? Any foreseeable problems if I begin evolving the trunk before that merge?
If there are changes in 1.32.0 that haven't shown up on the trunk (there should be few -- the standard procedure is to change the trunk and merge to the branch), it's up to individual developers to merge them back in as they see fit. There's no official merge process.
OK. A note of warning, though: during the last days before the release, Aleksey commited some changes to the docs directly in the branch. These changes affect: 1. The main page (portions of the release notes) 2. The MPL docs 3. Boost.MultiIndex (some docs pages) 4. Other libraries? I'm sure Aleksey'll take care of 1 and 2, and I'll be merging the stuff concerning 3, but if there are some other affected libraries I think they should be listed here in the list, or else the changes may not go into the trunk ever. Joaquín M López Muñoz Telefónica, Investigación y Desarrollo
Joaquín Mª López Muñoz writes:
OK. A note of warning, though: during the last days before the release, Aleksey commited some changes to the docs directly in the branch. These changes affect:
1. The main page (portions of the release notes) 2. The MPL docs 3. Boost.MultiIndex (some docs pages) 4. Other libraries?
I'm sure Aleksey'll take care of 1 and 2,
I'm going to take care of everything. -- Aleksey Gurtovoy MetaCommunications Engineering
On Wed, 24 Nov 2004 11:00:48 -0600, Aleksey Gurtovoy wrote
Joaquín Mª López Muñoz writes:
OK. A note of warning, though: during the last days before the release, Aleksey commited some changes to the docs directly in the branch. These changes affect:
1. The main page (portions of the release notes) 2. The MPL docs 3. Boost.MultiIndex (some docs pages) 4. Other libraries?
I'm sure Aleksey'll take care of 1 and 2,
I'm going to take care of everything.
The other libraries really should be up to the library maintainer if for no other reason than Aleksey has already done a ton of work. And really these mainline merges should be done at the same time as the RC branch is updated if they are obvious. The whole point being that the mainline can move on while the release finalization is in process. Anyway, please be careful -- I, for one, have already taken care of my library and the mainline has already moved on. It's not that I don't trust CVS to merge correctly, but well, I've been burned before.... Jeff
Jeff Garland writes:
On Wed, 24 Nov 2004 11:00:48 -0600, Aleksey Gurtovoy wrote
Joaquín Mª López Muñoz writes:
OK. A note of warning, though: during the last days before the release, Aleksey commited some changes to the docs directly in the branch. These changes affect:
1. The main page (portions of the release notes) 2. The MPL docs 3. Boost.MultiIndex (some docs pages) 4. Other libraries?
I'm sure Aleksey'll take care of 1 and 2,
I'm going to take care of everything.
The other libraries really should be up to the library maintainer if for no other reason than Aleksey has already done a ton of work. And really these mainline merges should be done at the same time as the RC branch is updated if they are obvious.
Depends on how much time you have on your hands. However late, 1.32 would be released even later if I was blindly following the rule.
The whole point being that the mainline can move on while the release finalization is in process.
And the whole point of a SCM system is to handle situations like this gracefully :).
Anyway, please be careful -- I, for one, have already taken care of my library and the mainline has already moved on. It's not that I don't trust CVS to merge correctly, but well, I've been burned before....
I'm always careful. -- Aleksey Gurtovoy MetaCommunications Engineering
Aleksey Gurtovoy writes:
Joaquín Mª López Muñoz writes:
OK. A note of warning, though: during the last days before the release, Aleksey commited some changes to the docs directly in the branch. These changes affect:
1. The main page (portions of the release notes) 2. The MPL docs 3. Boost.MultiIndex (some docs pages) 4. Other libraries?
I'm sure Aleksey'll take care of 1 and 2,
I'm going to take care of everything.
Done. -- Aleksey Gurtovoy MetaCommunications Engineering
participants (4)
-
Aleksey Gurtovoy -
David Abrahams -
Jeff Garland -
Joaquín Mª López Muñoz