On Sun, Nov 11, 2012 at 10:13:39AM +0000, Garth N. Wells wrote: > On Sun, Nov 11, 2012 at 9:41 AM, Anders Logg <[email protected]> wrote: > > When I merge, I get a list of commit messages at the bottom of the > > commit message for the merge in my text editor. It might be enough to > > just copy that to the top of the commit message (above the lines that > > bzr is cutting). > > > > Would be good if this could be automated - I tend to do 'bzr commit -m > "foo"' rather than starting up an editor.
Agree, but the easy fix in this case is to write 'bzr commit', write "Merge foo:" in the editor and copy-paste the commit messages located below the list of files. This could probably be automated or hacked some way but the extra effort to copy-paste the list is quite small compared to the actual work of doing the merge. ;-) -- Anders > Garth > > > > > > > On Sun, Nov 11, 2012 at 10:33:41AM +0100, Johan Hake wrote: > >> Garth! > >> > >> Could you be a bit more descreptive in the merge messages? > >> > >> Johan > >> > >> On Nov 10, 2012 11:20 PM, <[1][email protected]> wrote: > >> > >> Merge authors: > >> Garth Wells (garth-wells) > >> ------------------------------------------------------------ > >> revno: 7094 [merge] > >> committer: Garth N. Wells <[2][email protected]> > >> branch nick: trunk > >> timestamp: Sat 2012-11-10 22:19:32 +0000 > >> message: > >> Merge work on MeshPartitioning > >> modified: > >> dolfin/fem/UFCCell.h > >> dolfin/io/HDF5File.cpp > >> dolfin/io/XMLLocalMeshSAX.cpp > >> dolfin/io/XMLMeshFunction.h > >> dolfin/mesh/Cell.h > >> dolfin/mesh/CellType.cpp > >> dolfin/mesh/CellType.h > >> dolfin/mesh/IntervalCell.cpp > >> dolfin/mesh/IntervalCell.h > >> dolfin/mesh/LocalMeshData.h > >> dolfin/mesh/LocalMeshValueCollection.h > >> dolfin/mesh/MeshConnectivity.cpp > >> dolfin/mesh/MeshConnectivity.h > >> dolfin/mesh/MeshDistributed.cpp > >> dolfin/mesh/MeshDistributed.h > >> dolfin/mesh/MeshEditor.cpp > >> dolfin/mesh/MeshEditor.h > >> dolfin/mesh/MeshOrdering.cpp > >> dolfin/mesh/MeshPartitioning.cpp > >> dolfin/mesh/MeshPartitioning.h > >> dolfin/mesh/MeshTopology.cpp > >> dolfin/mesh/MeshTopology.h > >> dolfin/mesh/PointCell.cpp > >> dolfin/mesh/PointCell.h > >> dolfin/mesh/TetrahedronCell.cpp > >> dolfin/mesh/TetrahedronCell.h > >> dolfin/mesh/TriangleCell.cpp > >> dolfin/mesh/TriangleCell.h > >> The size of the diff (2179 lines) is larger than your specified > >> limit of 500 lines > >> > >> Referenser > >> > >> 1. mailto:[email protected] > >> 2. mailto:[email protected] > >> 3. https://code.launchpad.net/~dolfin-core/dolfin/trunk > >> 4. > >> https://code.launchpad.net/~dolfin-core/dolfin/trunk/+edit-subscription > > > >> _______________________________________________ > >> Mailing list: https://launchpad.net/~dolfin > >> Post to : [email protected] > >> Unsubscribe : https://launchpad.net/~dolfin > >> More help : https://help.launchpad.net/ListHelp > > > > > > _______________________________________________ > > Mailing list: https://launchpad.net/~dolfin > > Post to : [email protected] > > Unsubscribe : https://launchpad.net/~dolfin > > More help : https://help.launchpad.net/ListHelp _______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : [email protected] Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
