df покажет разницу, покажи здесь. tc - будет моя версия, mc - твоя
[root@my /usr/local/nodeny]# svn up
Updating '.':
G web/operations.pl
C noserver.pl
Updated to revision 352.
Conflict discovered in file 'noserver.pl'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(r) mark resolved, (mc) my side of conflict,
(tc) their side of conflict, (s) show all options: df
--- noserver.pl.3.r352 - THEIRS
+++ noserver.pl - MERGED
@@ -10,14 +10,55 @@
# Sql п╡я▀п╠п╬я─п╨п╦ п╡я│п╣я┘ п╟п╡я┌п╬я─п╦п╥п╬п╡п╟п╫п╫я▀я┘ п╨п╩п╦п╣п╫я┌п╬п╡, п╨п╬я┌п╬я─я▀п╪ п╫п╣ п╥п╟п©я─п╣я┴п╣п╫ п╢п╬я│я┌я┐п© п╦ я┐ п╨п╬я┌п╬я─я▀я┘ п©п╬п╢п╨п╩я▌я┤п╣п╫п╟ я┐я│п╩я┐пЁп╟ я│ я┌п╣пЁп╬п╪ `inet`
+#my $sql_get_auth_usr = <<SQL;
+# SELECT u.id, a.ip, u.balance, u.name FROM (
+# SELECT INET_NTOA(i.ip) AS ip FROM users u JOIN ip_pool i ON i.uid=u.id WHERE u.lstate=1
+# UNION
+# SELECT ip FROM auth_now
+# ) a
+# JOIN ip_pool i ON INET_ATON(a.ip)=i.ip
+# JOIN users u ON i.uid=u.id
+# WHERE u.state='on' AND {{and_where}}
+# EXISTS (SELECT uid FROM v_services WHERE tags LIKE '%,inet,%' AND uid=u.id)
+#SQL
+
my $sql_get_auth_usr = <<SQL;
+<<<<<<< .mine
+<<<<<<< .mine
+<<<<<<< .mine
+ SELECT u.id, INET_NTOA(i.ip) AS ip, u.balance, u.name FROM users u
+ JOIN ip_pool i ON i.uid=u.id
+||||||| .r351
+ SELECT u.id, a.ip, u.balance, u.name FROM (
+ SELECT INET_NTOA(i.ip) AS ip FROM users u JOIN ip_pool i ON i.uid=u.id WHERE u.lstate=1
+||||||| .r350
+ SELECT u.id, a.ip, u.balance, u.name FROM (
+ SELECT INET_NTOA(i.ip) AS ip FROM users u JOIN ip_pool i ON i.uid=u.id WHERE u.lstate=1
+=======
SELECT u.id, a.ip, a.properties, u.balance, u.name FROM (
SELECT INET_NTOA(i.ip) AS ip, '' as properties FROM users u JOIN ip_pool i ON i.uid=u.id WHERE u.lstate=1
+>>>>>>> .r352
+||||||| .r335
+ SELECT u.id, a.ip, u.balance, u.name FROM (
+ SELECT INET_NTOA(i.ip) AS ip FROM users u JOIN ip_pool i ON i.uid=u.id WHERE u.lstate=1
+=======
+ SELECT u.id, a.ip, a.properties, u.balance, u.name FROM (
+ SELECT INET_NTOA(i.ip) AS ip, '' as properties FROM users u JOIN ip_pool i ON i.uid=u.id WHERE u.lstate=1
+>>>>>>> .r352
UNION
SELECT ip, properties FROM auth_now
) a
JOIN ip_pool i ON INET_ATON(a.ip)=i.ip
JOIN users u ON i.uid=u.id
+=======
+ SELECT u.id, a.ip, a.properties, u.balance, u.name FROM (
+ SELECT INET_NTOA(i.ip) AS ip, '' as properties FROM users u JOIN ip_pool i ON i.uid=u.id WHERE u.lstate=1
+ UNION
+ SELECT ip, properties FROM auth_now
+ ) a
+ JOIN ip_pool i ON INET_ATON(a.ip)=i.ip
+ JOIN users u ON i.uid=u.id
+>>>>>>> .r352
WHERE u.state='on' AND {{and_where}}
EXISTS (SELECT uid FROM v_services WHERE tags LIKE '%,inet,%' AND uid=u.id)
SQL
@@ -302,4 +343,4 @@
return {};
}
-1;
\ No newline at end of file
+1;
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(r) mark resolved, (mc) my side of conflict,
(tc) their side of conflict, (s) show all options: tc
Resolved conflicted state of 'noserver.pl'
Summary of conflicts:
Text conflicts: 0 remaining (and 1 already resolved)
[root@my /usr/local/nodeny]#
