trying for quite some hours now to set it up nicely
the solution described in that link below doesn't work for windows users,
that just makes a copy.
for windows users this script must be used:
http://git.661346.n2.nabble.com/Fwd-git-git-new-workdir-for-Windows-9-td6479570.html
(run it as an
Are you sure that the changed files is caused by the multi-workspace setup? It
could also be a problem with the core.autocrlf option. At Topicus, we decided
to turn it off on all systems. EGit doesn't support it and caused more trouble
than it does good.
Personally, I still like the solution
what is the best way to set that ? or turn that off?
i tried this
http://stackoverflow.com/questions/1510798/trying-to-fix-line-endings-with-git-filter-branch-but-having-no-luck/1511273#1511273
but still many many outgoing changes.
On Fri, Jan 6, 2012 at 14:09, Emond Papegaaij
2012/1/4 Johan Compagner jcompag...@gmail.com:
What is then the nicest way?
Because must i then do a commit the local on 1.4 push that to the remote
then go to 1.5 and pull it, then merge the 1.4 changes to 1.5, commit that
(this could be slightly different because of some changes)
push that
Well, you'd rather not rewrite the entire wicket history using filter-branch,
or your co-committer (of which I am now one) will be very upset and angry.
You can find information on git configuration at
http://progit.org/book/ch7-1.html . It also contains a section about
core.autocrlf. Just
It seems to be fine now, when i do the cloning completely in eclipse with
that property in the eclipse preferences set to false.
On Fri, Jan 6, 2012 at 14:42, Emond Papegaaij emond.papega...@topicus.nlwrote:
Well, you'd rather not rewrite the entire wicket history using
filter-branch,
or
Ok, its getting clearer and clearer,
The thing is what i want is that i can make make a change for 1.4, 1.5 and
master/trunk
And do that all locally
Then push that to the remove at once.
I guess what i just need to do for that is pull 1 git repo from remote,
Get there the 3 branches at onces,
From what I understand, your solution would work well. You would have:
wicket-trunk remote = gitHub
wicket_14 remote = wicket-trunk
wicket_15 remote = wicket-trunk
What Renaud and and Edmond described is instead:
wicket-trunk remotes = [gitHub, wicket_14, wicket_15]
wicket_14 remotes = [gitHub,
the thing is i like the first approach if that one works,
why? Because then i am forced to first merge it over all revisions before i
can then push it upstream at once
i never can push right to wicket if i just make a change in 1.4 or 1.5, i
need to think and open 1.5 and or trunk first and do
hmm i HATE command line
i almost never use that, and i am not planning to use it much now, i really
think that is what an IDE is for! This is just going back to the dark ages
of the 90's or something
Tooling like this should just be next, next, finish in my eyes, quick and
easy.
We are already
I also really like a UI better with scrollable file lists and multiple
panels way better than command line for version control.
I'm also on Windows and have started using Git Extensions
(http://code.google.com/p/gitextensions/). From my recent experiments,
it works really well and is quite
i have a friend of mine that is also a long time eclipse users and he has
now a few months a job where they have to use Intellij
his qoute from a few days (after using it now for quite a while) ago: btw,
intellij sucksnah, eclipse is way ahead
so i guess thats a matter of taste..
The
Currently i just have 3 workspaces for wicket (1.4,1,5 and trunk/master)
But git works with a/one working directory...
thats always one of those..
So is the only solution to have the remote git repo dumped three times on
my disk?
I don't find that very logical..
And no i don't want to
Hi Johan,
You can have one working directory (aka local repository) with these
three branches and switch between them with git checkout or the same
command in EGit.
You can also have 3 working directories - one for each branch. This
way you can load them at once in one Eclipse instance of each
On Wed, Jan 4, 2012 at 4:25 PM, Johan Compagner jcompag...@gmail.com wrote:
Currently i just have 3 workspaces for wicket (1.4,1,5 and trunk/master)
But git works with a/one working directory...
thats always one of those..
So is the only solution to have the remote git repo dumped three
What you need is a separate working directory managed
by the same local repo. There's a script git new-workdir in contrib/
that does that for you.
See http://nuclearsquid.com/writings/git-new-workdir/ for details.
Carl-Eric
www.wicketbuch.de
On Wed, 4 Jan 2012 16:25:32 +0100
Johan Compagner
With git, switching between branches is very fast, but as you said, with
Eclipse it's not. You can have a look at this:
http://finik.net/2010/10/24/multiple-working-folders-with-single-git-
repository/
Another solution is to use git remotes to link the clones using (local)
remotes. You can add
Yes i don't care to much about the disk space
But if i make a commit in to 1.4 that also want to merge over 1.5 and trunk
What is then the nicest way?
Because must i then do a commit the local on 1.4 push that to the remote
then go to 1.5 and pull it, then merge the 1.4 changes to 1.5, commit
Git switching could be very vast
But between 1.4 and 1.5 there are really project changes (like wicket-core
and just wicket)
So if i switch between them in eclipse, i constantly get all kind of
compile warnings...
And if i reflect that again on our own servoy product (if we would also go
to git)
19 matches
Mail list logo
