Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users - page 2 - CHDK Releases - CHDK Forum

Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users

  • 41 Replies
  • 29800 Views
*

Offline chr

  • ***
  • 138
  • IXUS 82 IS
Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #10 on: 15 / September / 2008, 08:45:08 »
Advertisements
Hey, this is a great move but it's a great disaster in svn!

In fact you did not merge. U tried to exchange the branches and that was a failure. You noticed, we lost history?

This is how the history of makefile.inc looks in actual trunk:

/trunk/makefile.inc (log) - chdk - Trac

Even with the "follow copy" option svn follows trunk, not juci branch:

/trunk/makefile.inc (log) - chdk - Trac

I do confess I don't know how to do better with svn. Ppl who read me in irc know what comes next  8)




Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #11 on: 15 / September / 2008, 12:00:39 »
Well, as a "normal" user that only wants to install CHDK on his camera and use it, I'm very confused about what does this move mean to us. It seems some features of each version are lost on the merge? Where are we supposed to download the last CHDK binaries from now on?

I think unifying all CHDK developments is an smart move. But maybe it has been a precipitate move? Should we wait until things clarify and stabilize?

Thanks.

*

Offline fudgey

  • *****
  • 1705
  • a570is
Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #12 on: 15 / September / 2008, 12:23:25 »
Well, as a "normal" user that only wants to install CHDK on his camera and use it, I'm very confused about what does this move mean to us. It seems some features of each version are lost on the merge? Where are we supposed to download the last CHDK binaries from now on?

What Chr wrote is only important for developers. The history of changes to each source file was lost from the version control system (a developer tracking things from old versions must now dig the history using the old juciphox branch, which is cumbersome), but that doesn't have any effect on the actual builds users like yourself download.

*

Offline PhyrePhoX

  • *****
  • 2254
  • make RAW not WAR
    • PhyreWorX
Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #13 on: 15 / September / 2008, 12:58:13 »
it is likely that the svn mess will be solved somehow.


Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #14 on: 15 / September / 2008, 13:58:12 »
1 or 2 weeks ago I went from Allbest 50 to Juciphox. Are there any new features introduced to Juciphox by this merge?

*

Offline chr

  • ***
  • 138
  • IXUS 82 IS
Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #15 on: 15 / September / 2008, 14:15:45 »

*

Offline PhyrePhoX

  • *****
  • 2254
  • make RAW not WAR
    • PhyreWorX
Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #16 on: 15 / September / 2008, 14:45:31 »
no, juciphox was allbest + new features.

now allbest IS juciphox. and together they are CHDK. so no, for juciphox users there is nothing new.
the most important change is for the developers - we now have to keep only ONE branch up to date.

Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #17 on: 15 / September / 2008, 15:58:45 »
And IMO this is a smart move, and everyone will benefit.
Never noticed the memory browser and the benchmark before, so the merge made me more of a geek :D


*

Offline fe50

  • ******
  • 3105
  • IXUS50 & 860, SX10 Star WARs-Star RAWs
    • fe50
Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #18 on: 15 / September / 2008, 17:22:54 »
...But besides from that, I noticed a lot of file in juci changed to dos linestyle :( I vote for running a tool on all source files to convert to the same linestyle\n !!! "git mergetool" runs crazy on that.

Chris, do you mean the EOL (End-Of-Line) style, the Windows-like CR + LF ?

Quote from: the latest GIT installer
  Important Compatibility Notice
  With Git 1.5.5, the default for core.autocrlf changes to "true". This means that Git converts line endings to CRLF (Windows line endings)
  in your work tree and  to LF (Unix line endings) in the repository. This is the right choice for cross-platform projects.
  If you wish to keep the old behavior, you can run  git config --global core.autocrlf false  for the user accounts that shall
  use the old default; or you can set the system-wide default by editing "etc/gitconfig" in the installation directory.

Now i'm somewhat confused...

Does this mean that when working under Windows the local files with CR+LF (it's not so easy to avoid this with "standard" windows tools) will be "corrected" automatically on merging ?

What about the diff-files - will they be treated correct in all situations ?

*

Offline reyalp

  • ******
  • 12058
Re: Allbest + JuciPhoX = CHDK (the merge thread) - info for devs and users
« Reply #19 on: 15 / September / 2008, 17:39:43 »
Just an FYI, I've redone the juciphox -> trunk move so that the revision history shows. Similarly for old-trunk. (yay, my first chdk action was "delete trunk"  :o)

At the moment, trunk is just a straight copy of juciphox.

I'm in the process of merging the changes that were in trunk but not juciphox. The old juciphox branch still exists, but it will be removed or renamed so people don't use working copies that are set up against the wrong branch. You should be able to update your old juciphox working copy to reflect the move by using svn switch

I'll do something with eol-styles when I'm done with that I guess.
Don't forget what the H stands for.

 

Related Topics