merging in a filetree repository

Thierry,

>> $ git config --get merge.mcVersion.driver
>
> ~/HackathonSattose2015> git config --get merge.mcVersion.driver
> pathToGitFileTree-MergeDriver/merge --version %O %A %B

Any idea how I can merge then?
Is this value what you expected?

Cheers,
Alexandre
--
_,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
Alexandre Bergel  http://www.bergel.eu
^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.

On 08 Jul 2015, at 15:19, Thierry Goubier <[hidden email]> wrote:

2015-07-08 15:11 GMT+02:00 Alexandre Bergel <[hidden email]>:

> Our “coding” atoms are methods, not classes. Having method per file we can trace the history of changes with method detail, not class.

That I understand.

> Now… you are complaining in the wrong problem.

Well… Having one file per method seems to be very problematic after all.

It's not ;)

 

> FileTree meta information (who causes your merge problems) is needed *just* to keep monticello compatibility.
> That’s what is plain wrong and should be at least optional :)
>
> I would happily integrate a “PlainFileTree” protocol (without monticello information) as an option, if someone provides such extension.
> Crap, I could make it myself if I have the time!… maybe next insomnia night :P

We can work on this next week. I am fed up to hear “why you guys are not using github?"

It's extremely easy to do.

Most of the code is ready for it.

But since there is no real push to get Pharo under git for now, I've left it as it is. In part because some are using FileTree directly and they need that compatibility level.

you’re wrong :)

I feel the pain each time I need to provide a “we are not ready yet”. 

As I said… real reason we are not ready is because we are still trying to mix to words, in ways no one actually needs.

So please… push!

Esteban

ps: and btw… there is no reason why we cannot keep “mc-file-tree” along with a “plain-file-tree” both alive. As I said… I just can image very few cases when we *actually* need that compatibility.

> Then this means the make in GitFileTree-MergeDriver hasn't worked. When you did the make, what was the output?

It is:

-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
~/Dropbox/Workspace/GitFileTree-MergeDriver> make
mkdir pharo
cd pharo; wget -O- get.pharo.org/30+vm | bash
--2015-07-08 14:20:12--  http://get.pharo.org/30+vm
Resolving get.pharo.org... 128.93.162.72
Connecting to get.pharo.org|128.93.162.72|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 2901 (2.8K) [text/html]
Saving to: 'STDOUT'

-                   100%[=====================>]   2.83K  --.-KB/s   in 0s

2015-07-08 14:20:12 (146 MB/s) - written to stdout [2901/2901]

Downloading the latest 30 Image:
    http://files.pharo.org/get-files/30/pharo.zip
Pharo.image
Downloading the latest pharoVM:
        http://files.pharo.org/get-files/30/pharo-mac-stable.zip
pharo-vm/Pharo.app/Contents/MacOS/Pharo
Downloading PharoV30.sources:
        http://files.pharo.org/get-files/30/sources.zip
Creating starter scripts pharo and pharo-ui
pharo/pharo pharo/Pharo.image --no-default-preferences eval --save Gofer new url: \'<a href="http://smalltalkhub.com/mc/ThierryGoubier/Alt30/main/\" rel="noreferrer" target="_blank">http://smalltalkhub.com/mc/ThierryGoubier/Alt30/main/\'\; package: \'GitFileTree-MergeDriver\'\; load
a GoferLoad
git config --global merge.mcVersion.driver "`pwd`/merge --version %O %A %B"
git config --global merge.mcMethodProperties.name "GitFileTree MergeDriver for Monticello"
git config --global merge.mcMethodProperties.driver "`pwd`/merge --methodProperties %O %A %B"
git config --global merge.mcProperties.name "GitFileTree MergeDriver for Monticello"
git config --global merge.mcProperties.driver "`pwd`/merge --properties %O %A %B"
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=

Please help :-)

Alexandre

I tried:

~/HackathonSattose2015> readlink --help
readlink: illegal option -- -
usage: readlink [-n] [file ...]
~/HackathonSattose2015> readlink -help
readlink: illegal option -- h
usage: readlink [-n] [file ...]
~/HackathonSattose2015> readlink -?
readlink: illegal option -- ?
usage: readlink [-n] [file ...]
~/HackathonSattose2015> readlink -h
readlink: illegal option -- h
usage: readlink [-n] [file ...]
~/HackathonSattose2015> readlink
~/HackathonSattose2015>

> On Jul 9, 2015, at 10:34 AM, Thierry Goubier <[hidden email]> wrote:
>
> Alexandre, if you had the time, could you give me the output of
>
> readlink --help
>
> on your computer?
>
> Thanks,
>
> Thierry
>
> 2015-07-09 9:44 GMT+02:00 Alexandre Bergel <[hidden email]>:
> Ok, thanks!
>
> Alexandre
>
> > On Jul 8, 2015, at 11:39 PM, Thierry Goubier <[hidden email]> wrote:
> >
> > Le 08/07/2015 23:25, Alexandre Bergel a écrit :
> >> Thanks Thierry. Seems to work. But I get this error:
> >>
> >> ~/HackathonSattose2015> git merge master
> >> readlink: illegal option -- e
> >> usage: readlink [-n] [file ...]
> >> readlink: illegal option -- e
> >> usage: readlink [-n] [file ...]
> >> readlink: illegal option -- e
> >> usage: readlink [-n] [file …]
> >
> > Can you edit the merge file (~/Dropbox/Workspace/GitFileTree-MergeDriver/merge) and change that line:
> >
> > DIR=`readlink -e "$0"` || DIR="$0";
> >
> > to:
> >
> > DIR=`readlink "$0"` || DIR="$0";
> >
> > (I would have expected this to work as well on a mac... but it isn't the case :(:( The -e option is there to try to see through symlinks. I'll correct that.)
> >
> > Thierry
> >
> >>
> >> Any idea?
> >>
> >> Alexandre
> >>
> >>
> >>> On Jul 8, 2015, at 3:31 PM, Thierry Goubier <[hidden email]> wrote:
> >>>
> >>>
> >>>
> >>> 2015-07-08 15:24 GMT+02:00 Alexandre Bergel <[hidden email]>:
> >>> Thierry,
> >>>
> >>>>> $ git config --get merge.mcVersion.driver
> >>>>
> >>>> ~/HackathonSattose2015> git config --get merge.mcVersion.driver
> >>>> pathToGitFileTree-MergeDriver/merge --version %O %A %B
> >>>
> >>> Any idea how I can merge then?
> >>> Is this value what you expected?
> >>>
> >>> No.
> >>>
> >>> If you have your path for the merge command (something like
> >>> /User/Alexandre/GitFileTree-MergeDriver/merge ), then it should be:
> >>>
> >>>  ~/HackathonSattose2015> git config --get merge.mcVersion.driver
> >>>  /User/Alexandre/GitFileTree-MergeDriver/merge --version %O %A %B
> >>>
> >>> To correct it, what you can do by hand is:
> >>>
> >>>     git config --global merge.mcVersion.driver "/User/Alexandre/GitFileTree-MergeDriver/merge --version %O %A %B"
> >>>     git config --global merge.mcMethodProperties.driver "/User/Alexandre/GitFileTree-MergeDriver/merge --methodProperties %O %A %B"
> >>>     git config --global merge.mcProperties.driver "/User/Alexandre/GitFileTree-MergeDriver/merge --properties %O %A %B"
> >>>
> >>> Don't forget to update the path !
> >>>
> >>> Thierry
> >>>
> >>>
> >>> Cheers,
> >>> Alexandre
> >>> --
> >>> _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
> >>> Alexandre Bergel  http://www.bergel.eu
> >>> ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
> >>>
> >>>
> >>>
> >>>
> >>>
> >>
> >
> >
>
> --
> _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
> Alexandre Bergel  http://www.bergel.eu
> ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
>
>
>
>
>

--
_,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
Alexandre Bergel  http://www.bergel.eu
^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.

Am 09.07.2015 um 15:27 schrieb Thierry Goubier <[hidden email]>:

Thanks.

I believe there are no options of stat or readlink that are the same between linux and mac os X :(

I like Unix portability ;)

You mean POSIX? ;)

Norbert

2015-07-09 14:29 GMT+02:00 Christophe Demarey <[hidden email]>:

The man page lists available options on OS X:

STAT(1)                   BSD General Commands Manual                  STAT(1)

NAME

     readlink, stat -- display file status

SYNOPSIS

     stat [-FLnq] [-f format | -l | -r | -s | -x] [-t timefmt] [file ...]

     readlink [-n] [file ...]

DESCRIPTION

     The stat utility displays information about the file pointed to by file.

     Read, write or execute permissions of the named file are not required,

     but all directories listed in the path name leading to the file must be

     searchable.  If no argument is given, stat displays information about the

     file descriptor for standard input.

     When invoked as readlink, only the target of the symbolic link is

     printed.  If the given argument is not a symbolic link, readlink will

     print nothing and exit with an error.

     The information displayed is obtained by calling lstat(2) with the given

     argument and evaluating the returned structure.

     The options are as follows:

     -F      As in ls(1), display a slash (`/') immediately after each path-

             name that is a directory, an asterisk (`*') after each that is

             executable, an at sign (`@') after each symbolic link, a percent

             sign (`%') after each whiteout, an equal sign (`=') after each

             socket, and a vertical bar (`|') after each that is a FIFO.  The

             use of -F implies -l.

     -f format

             Display information using the specified format.  See the FORMATS

             section for a description of valid formats.

     -L      Use stat(2) instead of lstat(2).  The information reported by

             stat will refer to the target of file, if file is a symbolic

             link, and not to file itself.

     -l      Display output in ls -lT format.

     -n      Do not force a newline to appear at the end of each piece of out-

             put.

     -q      Suppress failure messages if calls to stat(2) or lstat(2) fail.

             When run as readlink, error messages are automatically sup-

             pressed.

     -r      Display raw information.  That is, for all the fields in the stat

             structure, display the raw, numerical value (for example, times

             in seconds since the epoch, etc.).

     -s      Display information in ``shell output'', suitable for initializ-

             ing variables.

     -t timefmt

             Display timestamps using the specified format.  This format is

             passed directly to strftime(3).

     -x      Display information in a more verbose way as known from some

             Linux distributions.

Le 9 juil. 2015 à 13:46, Thierry Goubier a écrit :

2015-07-09 13:41 GMT+02:00 Alexandre Bergel <[hidden email]>:

I tried:

~/HackathonSattose2015> readlink --help
readlink: illegal option -- -
usage: readlink [-n] [file ...]
~/HackathonSattose2015> readlink -help
readlink: illegal option -- h
usage: readlink [-n] [file ...]
~/HackathonSattose2015> readlink -?
readlink: illegal option -- ?
usage: readlink [-n] [file ...]
~/HackathonSattose2015> readlink -h
readlink: illegal option -- h
usage: readlink [-n] [file ...]
~/HackathonSattose2015> readlink
~/HackathonSattose2015>

Thanks, this helps!

I have updated the merge driver with a corrected merge script, which should work for you if you want to update.

Thierry

 

> On Jul 9, 2015, at 10:34 AM, Thierry Goubier <[hidden email]> wrote:
>
> Alexandre, if you had the time, could you give me the output of
>
> readlink --help
>
> on your computer?
>
> Thanks,
>
> Thierry
>
> 2015-07-09 9:44 GMT+02:00 Alexandre Bergel <[hidden email]>:
> Ok, thanks!
>
> Alexandre
>
> > On Jul 8, 2015, at 11:39 PM, Thierry Goubier <[hidden email]> wrote:
> >
> > Le 08/07/2015 23:25, Alexandre Bergel a écrit :
> >> Thanks Thierry. Seems to work. But I get this error:
> >>
> >> ~/HackathonSattose2015> git merge master
> >> readlink: illegal option -- e
> >> usage: readlink [-n] [file ...]
> >> readlink: illegal option -- e
> >> usage: readlink [-n] [file ...]
> >> readlink: illegal option -- e
> >> usage: readlink [-n] [file …]
> >
> > Can you edit the merge file (~/Dropbox/Workspace/GitFileTree-MergeDriver/merge) and change that line:
> >
> > DIR=`readlink -e "$0"` || DIR="$0";
> >
> > to:
> >
> > DIR=`readlink "$0"` || DIR="$0";
> >
> > (I would have expected this to work as well on a mac... but it isn't the case :(:( The -e option is there to try to see through symlinks. I'll correct that.)
> >
> > Thierry
> >
> >>
> >> Any idea?
> >>
> >> Alexandre
> >>
> >>
> >>> On Jul 8, 2015, at 3:31 PM, Thierry Goubier <[hidden email]> wrote:
> >>>
> >>>
> >>>
> >>> 2015-07-08 15:24 GMT+02:00 Alexandre Bergel <[hidden email]>:
> >>> Thierry,
> >>>
> >>>>> $ git config --get merge.mcVersion.driver
> >>>>
> >>>> ~/HackathonSattose2015> git config --get merge.mcVersion.driver
> >>>> pathToGitFileTree-MergeDriver/merge --version %O %A %B
> >>>
> >>> Any idea how I can merge then?
> >>> Is this value what you expected?
> >>>
> >>> No.
> >>>
> >>> If you have your path for the merge command (something like
> >>> /User/Alexandre/GitFileTree-MergeDriver/merge ), then it should be:
> >>>
> >>>  ~/HackathonSattose2015> git config --get merge.mcVersion.driver
> >>>  /User/Alexandre/GitFileTree-MergeDriver/merge --version %O %A %B
> >>>
> >>> To correct it, what you can do by hand is:
> >>>
> >>>     git config --global merge.mcVersion.driver "/User/Alexandre/GitFileTree-MergeDriver/merge --version %O %A %B"
> >>>     git config --global merge.mcMethodProperties.driver "/User/Alexandre/GitFileTree-MergeDriver/merge --methodProperties %O %A %B"
> >>>     git config --global merge.mcProperties.driver "/User/Alexandre/GitFileTree-MergeDriver/merge --properties %O %A %B"
> >>>
> >>> Don't forget to update the path !
> >>>
> >>> Thierry
> >>>
> >>>
> >>> Cheers,
> >>> Alexandre
> >>> --
> >>> _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
> >>> Alexandre Bergel  http://www.bergel.eu
> >>> ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
> >>>
> >>>
> >>>
> >>>
> >>>
> >>
> >
> >
>
> --
> _,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
> Alexandre Bergel  http://www.bergel.eu
> ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
>
>
>
>
>

--
_,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
Alexandre Bergel  http://www.bergel.eu
^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.