Bruno and Thomas,
Thanks for the info. I now see it is not necessary to close the branches.
When I try and do a compare locally on the two branches I get a bunch of files
showing up different. I believe this has to do with the way the line returns
get converted on Windows machine. because when I do a character based compare
all is the same.
I believe there needs a modification to the .hgeol file. currently **.c and
**.cpp are marked native.
**.c = native
**.cpp = native
Or maybe I am doing something else wrong?
Jim
On 2012-11-13 5:34 PM, T. Modes wrote:
I just grabbed the tip of libpano but noticed that there is a branch "libpano
13-2.9.18" that is not merged into the default branch.
http://panotools.hg.sourceforge.net/hgweb/panotools/libpano/graph
Reviewing the changes, I see that the same one have been added to the default
branch also, but I was wondering if it should be merged just to keep as few
branches open as possible?
All changes to the 2.9.18 branch are also applied separately to the
default branch. The default branch has also been merged with the
Photoshop branch.
So merging would not bring in "new" or modified code.
Also merging the 2 branches would not close the branch. (see e.g. the
merged PhotoshopPSB branch is still listed, as inactive, but not
closed)
hg branches
default 765:c9f63bc558e9
libpano13-2.9.18 758:ee6fb07f7305
optimizeroptions 740:ee9c33db755a
PhotoshopPSB 738:8c929483d775 (inactive)
libpano 708:774168101e71 (inactive)
There is no harm with open branches. Fore merely cosmetic causes the
libpano13-2.9.18 branch could be closed.
--
Jim Watters
http://photocreations.ca
--
You received this message because you are subscribed to the Google Groups "Hugin and
other free panoramic software" group.
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at http://groups.google.com/group/hugin-ptx
