7 Oct
2010
7 Oct
'10
10:15 a.m.
Hi all
In the past I broke the repo because I erased a couple of folders and created
symlinks with the same name. That caused several problems to git.
Now, I want to do it again. I realized that symlinks where a mistake and want
to erase them and create the folders again. I need some assistance not to break
the repo :)
Would it be safe if I erase the symlinks and recreate the folders in two
different commits? Maybe the problem was doing so in the same commit/push?
7 Oct
7 Oct
10:30 a.m.
On Oct 07, 2010 at 09:15, Jon Bonilla <manwe(a)aholab.ehu.es> wrote:
Hi all
In the past I broke the repo because I erased a couple of folders and created
symlinks with the same name. That caused several problems to git.
I wouldn't say you broke the repo. Merges and cherry-pick from version
with the folders to versions with the symlinks became more painfull
(requiring 1 or 2 extra commands).
Now, I want to do it again. I realized that symlinks where a mistake and want
to erase them and create the folders again. I need some assistance not to break
the repo :)
Would it be safe if I erase the symlinks and recreate the folders in two
different commits? Maybe the problem was doing so in the same commit/push?
The problem appears if you keep the same name, but change the type
(e.g. file foo becames directory foo, or directory foo becames symlink
foo).
The only way to avoid it is to use a different name (e.g debian_lenny
instead of debian-lenny) or maybe a different path (e..g
pkg/kamailio/debian/{debian-etch, debian-lenny ....}).
Andrei
10:35 a.m.
El Thu, 7 Oct 2010 09:30:04 +0200
Andrei Pelinescu-Onciul <andrei(a)iptel.org> escribió:
The problem appears if you keep the same name, but change the type
(e.g. file foo becames directory foo, or directory foo becames symlink
foo).
The only way to avoid it is to use a different name (e.g debian_lenny
instead of debian-lenny) or maybe a different path (e..g
pkg/kamailio/debian/{debian-etch, debian-lenny ....}).
Thanks. I'll got with distro_version then.
10:37 a.m.
On 10/7/10 9:35 AM, Jon Bonilla (Manwe) wrote:
El Thu, 7 Oct 2010 09:30:04 +0200
Andrei Pelinescu-Onciul<andrei(a)iptel.org> escribió:
or go with shorter names in debian
folder:
- debian/etch
- debian/lenny
Cheers,
Daniel
The problem appears if you keep the same name,
but change the type
(e.g. file foo becames directory foo, or directory foo becames symlink
foo).
The only way to avoid it is to use a different name (e.g debian_lenny
instead of debian-lenny) or maybe a different path (e..g
pkg/kamailio/debian/{debian-etch, debian-lenny ....}).
Thanks. I'll got with distro_version then.
11:03 a.m.
El Thu, 07 Oct 2010 09:37:47 +0200
Daniel-Constantin Mierla <daniel(a)kamailio.org> escribió:
On 10/7/10 9:35 AM, Jon Bonilla (Manwe) wrote:
Yes, but Makefile looks for pkg/kamailio/debian instead of
pkg/kamailio/debian/version
I would leave pkg/kamailio/debian as generic debian folder for those who use
"make deb" and have distro specific folders for build systems.
Unless we modify the "make deb" way or compiling the system adding distro and
version detection, with failover to pkg/kamailio/debian/generic on unsupported
debian based distro/versions
What do you think?
El Thu, 7 Oct 2010 09:30:04 +0200
Andrei Pelinescu-Onciul<andrei(a)iptel.org> escribió:
or go with shorter names in debian
folder:
- debian/etch
- debian/lenny
The problem appears if you keep the same name,
but change the type
(e.g. file foo becames directory foo, or directory foo becames symlink
foo).
The only way to avoid it is to use a different name (e.g debian_lenny
instead of debian-lenny) or maybe a different path (e..g
pkg/kamailio/debian/{debian-etch, debian-lenny ....}).
Thanks. I'll got with distro_version then. 
5164
days inactive
5164
days old
5 comments
4 participants
participants (4)
-
Andrei Pelinescu-Onciul -
Daniel-Constantin Mierla -
Iñaki Baz Castillo -
Jon Bonilla