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?
On Oct 07, 2010 at 09:15, Jon Bonilla manwe@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
El Thu, 7 Oct 2010 09:30:04 +0200 Andrei Pelinescu-Onciul andrei@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.
On 10/7/10 9:35 AM, Jon Bonilla (Manwe) wrote:
El Thu, 7 Oct 2010 09:30:04 +0200 Andrei Pelinescu-Onciulandrei@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.
or go with shorter names in debian folder:
- debian/etch - debian/lenny
Cheers, Daniel
El Thu, 07 Oct 2010 09:37:47 +0200 Daniel-Constantin Mierla daniel@kamailio.org escribió:
On 10/7/10 9:35 AM, Jon Bonilla (Manwe) wrote:
El Thu, 7 Oct 2010 09:30:04 +0200 Andrei Pelinescu-Onciulandrei@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.
or go with shorter names in debian folder:
- debian/etch
- debian/lenny
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?
2010/10/7 Jon Bonilla manwe@aholab.ehu.es:
In the past I broke the repo [...] Now, I want to do it again.
Nice to know X-D
-
Andrei Pelinescu-Onciul -
Daniel-Constantin Mierla -
Iñaki Baz Castillo -
Jon Bonilla